From 9936d909614999fd2a0202bbcf9931310846c6d9 Mon Sep 17 00:00:00 2001 From: Ximin Luo Date: Fri, 21 Jul 2017 18:57:06 +0200 Subject: [PATCH] Fix Makefile $-escaping syntax --- debian/changelog | 6 ++++++ debian/ocamlinit.mk | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) 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 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)) -- 2.30.2