Fix Makefile $-escaping syntax

diff --git a/debian/changelog b/debian/changelog
index 46481dbc11ec6fb2f982660bccf37321a99da2e7..26f07e671302d56ada0092770aa22f1213ef8f69 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml (4.05.0-3) UNRELEASED; urgency=medium
+
+  * Fix Makefile $-escaping syntax, fixes FTBFS on a bunch of arches.
+
+ -- Ximin Luo <infinity0@debian.org>  Fri, 21 Jul 2017 18:56:46 +0200
+
 ocaml (4.05.0-2) experimental; urgency=medium
 
   * Update conditional-install rules for easier maintenance. This fixes FTBFS

diff --git a/debian/ocamlinit.mk b/debian/ocamlinit.mk
index 10b216ae1fcf46c8b3cca5868cd56cbac38266be..35636d439d124265ad934c4d9613222284d39664 100644 (file)
--- a/debian/ocamlinit.mk
+++ b/debian/ocamlinit.mk
@@ -63,8 +63,8 @@ endif
 
 otherlib = \
 OCAMLINIT_SED += $(if $(filter $(1),$(OTHERLIBRARIES)),\
-  -e 's/^OTH: \(.*\b$(1)\.\w\w*$$\\)/\1/',\
-  -e '/^OTH: .*\b$(1)\.\w\w*$$/d')
+  -e 's/^OTH: \(.*\b$(1)\.\w\w*$$$$\)/\1/',\
+  -e '/^OTH: .*\b$(1)\.\w\w*$$$$/d')
 # careful, no whitespace after the comma
 $(eval $(call otherlib,raw_spacetime_lib))