From 7e432724a32db8fa71e4d0ba17c56f2d7375b475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kim=20Nguy=E1=BB=85n?= <kn@lri.fr>
Date: Thu, 7 Aug 2014 14:09:20 +0200
Subject: [PATCH 06/11] Make sure that the -g flag is correctly propagated to
 the auxiliary Makefile when compiling the ocaml/cduce interface

---
 Makefile.distrib         | 4 ++--
 ocamliface/4.02/Makefile | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Makefile.distrib b/Makefile.distrib
index 6378aac..cb0097d 100644
--- a/Makefile.distrib
+++ b/Makefile.distrib
@@ -374,11 +374,11 @@ install_doc: doc
 
 $(OCAMLIFACE)/caml_cduce.cmo:
 	@cd $(OCAMLIFACE); \
-	$(MAKE) caml_cduce.cmo
+	$(MAKE) CAMLC="$(CAMLC_P)" CAMLOPT="$(CAMLOPT_P)" caml_cduce.cmo
 
 $(OCAMLIFACE)/caml_cduce.cmx:
 	@cd $(OCAMLIFACE); \
-	$(MAKE) caml_cduce.cmx
+	$(MAKE) CAMLC="$(CAMLC_P)" CAMLOPT="$(CAMLOPT_P)" caml_cduce.cmx
 
 $(OCAMLIFACE)/mlstub.cmo: SYNTAX += q_MLast.cmo
 $(OCAMLIFACE)/mlstub.cmx: SYNTAX += q_MLast.cmo
diff --git a/ocamliface/4.02/Makefile b/ocamliface/4.02/Makefile
index c16c975..0433888 100644
--- a/ocamliface/4.02/Makefile
+++ b/ocamliface/4.02/Makefile
@@ -29,14 +29,15 @@ ocaml_files:
 caml_cduce.cmo: ocaml_files
 	@echo "Build $@"
 	(cd ocaml_files; \
-	ocamlc $(FORPACKOPT1) -c $(COMPILE_FILES);\
-	ocamlc $(FORPACKOPT2) -pack -o $@ $(OBJECTS); \
+	$(CAMLC) $(FORPACKOPT1) -c $(COMPILE_FILES);\
+	$(CAMLC) $(FORPACKOPT2) -pack -o $@ $(OBJECTS); \
 	cp caml_cduce.cmo caml_cduce.cmi ..)
 
 caml_cduce.cmx: ocaml_files
 	@echo "Build $@"
-	(cd ocaml_files; ocamlopt $(FORPACKOPT1) -c $(COMPILE_FILES);\
-	ocamlopt $(FORPACKOPT2) -pack -o $@ $(XOBJECTS); \
+	(cd ocaml_files; \
+	$(CAMLOPT) $(FORPACKOPT1) -c $(COMPILE_FILES);\
+	$(CAMLOPT) $(FORPACKOPT2) -pack -o $@ $(XOBJECTS); \
 	cp caml_cduce.cmx caml_cduce.o caml_cduce.cmi ..)
 
 clean:
-- 
1.9.3