From 26cb451aea4dd24f4f0fe31068af219cc30c0e07 Mon Sep 17 00:00:00 2001
From: letouzey
Date: Thu, 18 Mar 2010 19:44:14 +0000
Subject: Makefile.build: (slightly) more robust sed invocation for parsing
 camlp4deps/use lines

 The build error Y. Makarov recently reported on coq-club was caused by some
 .ml4 having dos-style end-of-line in his source-tree, and hence \r appearing in
 the camlp4o commandline. We now simply discard what appears after camlp4xxx "...".

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12871 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 Makefile.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.build b/Makefile.build
index 804461d5fd..0ac6b1f39b 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -98,8 +98,8 @@ $(OCAMLOPT) $(OPTFLAGS) -o $@ $(1) $(addsuffix .cmxa,$(2)) $^ && $(STRIP) $@,\
 $(OCAMLC) $(BYTEFLAGS) $(COQTOOLSBYTEFLAGS) -o $@ $(1) $(addsuffix .cma,$(2)) $^)
 endef
 
-CAMLP4DEPS=`sed -n -e 's@^(\*.*camlp4deps: "\(.*\)".*\*)@\1@p' $<`
-CAMLP4USE=`sed -n -e 's/pa_macro.cmo/pa_macro.cmo -D$(CAMLVERSION)/' -e 's@^(\*.*camlp4use: "\(.*\)".*\*)@\1@p' $<`
+CAMLP4DEPS=`sed -n -e 's@^(\*.*camlp4deps: "\(.*\)".*@\1@p' $<`
+CAMLP4USE=`sed -n -e 's/pa_macro.cmo/pa_macro.cmo -D$(CAMLVERSION)/' -e 's@^(\*.*camlp4use: "\(.*\)".*@\1@p' $<`
 
 PR_O := $(if $(READABLE_ML4),pr_o.cmo)
 
-- 
cgit v1.2.3