From: Ximin Luo <infinity0@debian.org>
Date: Fri, 21 Jul 2017 16:57:06 +0000 (+0200)
Subject: Fix Makefile $-escaping syntax
X-Git-Tag: archive/raspbian/4.08.1-4+rpi1~3^2~46
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9936d909614999fd2a0202bbcf9931310846c6d9;p=ocaml.git

Fix Makefile $-escaping syntax
---

diff --git a/debian/changelog b/debian/changelog
index 46481dbc..26f07e67 100644
--- 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 10b216ae..35636d43 100644
--- 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))