From 8ab85aa671cb8bd97435b8bce5435a62aca040cf Mon Sep 17 00:00:00 2001
From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Wed, 22 Jun 2005 13:50:19 +0000
Subject: [PATCH] restored local usage of OCAMLPATH so that ./script.sh should
 not be needed anymore

---
 helm/ocaml/Makefile.in | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/helm/ocaml/Makefile.in b/helm/ocaml/Makefile.in
index 889b87147..00b5b0dd2 100644
--- a/helm/ocaml/Makefile.in
+++ b/helm/ocaml/Makefile.in
@@ -24,7 +24,8 @@ OCAMLFIND_DEST_DIR = @OCAMLFIND_DEST_DIR@
 OCAMLFIND_META_DIR = @OCAMLFIND_META_DIR@
 
 METAS = $(MODULES:%=METAS/META.helm-%)
-CWD=`pwd`
+CWD := $(shell pwd)
+OCAMLPATH = $(CWD)/METAS/
 
 all: metas $(MODULES:%=%.all)
 opt: metas $(MODULES:%=%.opt)
@@ -41,12 +42,15 @@ distclean: clean clean_metas
 
 .PHONY: all opt world metas depend install uninstall clean clean_metas distclean
 
-$(MODULES:%=%.all):
-	export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.all=%) && make all
-$(MODULES:%=%.opt):
-	export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.opt=%) && make opt
-$(MODULES:%=%.depend):
-	export OCAMLPATH=$(CWD):$$OCAMLPATH ; cd $(@:%.depend=%) && make depend
+%.all:
+	OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* all
+%.opt:
+	OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* opt
+%.clean:
+	OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* clean
+%.depend:
+	OCAMLPATH=$(OCAMLPATH):$$OCAMLPATH $(MAKE) -C $* depend
+
 $(MODULES:%=%.install):
 	cd $(@:%.install=%) && make install
 	export TARGET=$(OCAMLFIND_META_DIR)/$(@:%.install=META.helm-%) ; \
@@ -55,8 +59,6 @@ $(MODULES:%=%.install):
 $(MODULES:%=%.uninstall):
 	cd $(@:%.uninstall=%) && make uninstall
 	rm -f $(OCAMLFIND_META_DIR)/$(@:%.uninstall=META.helm-%)
-$(MODULES:%=%.clean):
-	cd $(@:%.clean=%) && make clean
 METAS/META.helm-%: METAS/meta.helm-%.src
 	cp $< $@ && echo "directory=\"$(CWD)/$*\"" >> $@
 
-- 
2.39.2