400ece21ad7a — Malcolm Matalka 5.37 4 years ago 
FIX OCAMLPATH is actually a colon separated list
patch browse 
3 files changed, 27 insertions(+), 27 deletions(-)

M files/pds.mk.tmpl
M opam/packages/pds/pds.99999/opam
M pds.mk

M files/pds.mk.tmpl +13 -13
@@ 83,19 83,19 @@ clean: $(tests_clean_release) $(tests_cl
 
 $(projects_release):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/release/$(patsubst release_%,%,$@@) \
 	-C build/release/$(patsubst release_%,%,$@@)
 
 $(projects_debug):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/debug \
+	OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/debug/$(patsubst debug_%,%,$@@) \
 	-C build/debug/$(patsubst debug_%,%,$@@) debug
 
 $(projects_profile):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/profile \
+	OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/profile/$(patsubst profile_%,%,$@@) \
 	-C build/profile/$(patsubst profile_%,%,$@@) profile
 

          
@@ 104,26 104,26 @@ clean: $(tests_clean_release) $(tests_cl
 
 $(tests_release):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-release/$(patsubst profile_%,%,$@@) \
 	-C build/test-release/$(patsubst test-release_%,%,$@@)
 
 $(tests_debug):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/debug \
+	OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-debug/$(patsubst profile_%,%,$@@) \
 	-C build/test-debug/$(patsubst test-debug_%,%,$@@)
 
 $(tests_profile):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/profile \
+	OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-profile/$(patsubst profile_%,%,$@@) \
 	-C build/test-profile/$(patsubst test-profile_%,%,$@@)
 
 $(projects_docs): $(projects_release)
 	mkdir -p $(shell pwd)/build/docs/$(patsubst docs_%,%,$@@)
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/docs/$(patsubst docs_%,%,$@@) \
 	-C build/release/$(patsubst docs_%,%,$@@) docs
 

          
@@ 132,36 132,36 @@ clean: $(tests_clean_release) $(tests_cl
 
 $(projects_clean_release):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/release/$(patsubst clean-release_%,%,$@@) \
 	-C build/release/$(patsubst clean-release_%,%,$@@) clean
 
 $(projects_clean_debug):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/debug \
+	OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/debug/$(patsubst clean-debug_%,%,$@@) \
 	-C build/debug/$(patsubst clean-debug_%,%,$@@) clean
 
 $(projects_clean_profile):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/profile \
+	OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/profile/$(patsubst clean-profile_%,%,$@@) \
 	-C build/profile/$(patsubst clean-profile_%,%,$@@) clean
 
 $(tests_clean_release):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-release/$(patsubst test-clean-release_%,%,$@@) \
 	-C build/test-release/$(patsubst test-clean-release_%,%,$@@) test-clean
 
 $(tests_clean_debug):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/debug \
+	OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-debug/$(patsubst test-clean-debug_%,%,$@@) \
 	-C build/test-debug/$(patsubst test-clean-debug_%,%,$@@) test-clean
 
 $(tests_clean_profile):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/profile \
+	OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-profile/$(patsubst test-clean-profile_%,%,$@@) \
 	-C build/test-profile/$(patsubst test-clean-profile_%,%,$@@) test-clean

          
M opam/packages/pds/pds.99999/opam +1 -1
@@ 38,7 38,7 @@ homepage: "https://bitbucket.org/mimirop
 
 url {
 	src: "http://acsl-pkgs.s3.amazonaws.com/pds-99999.tar.gz"
-	checksum: "a7c22b035c5ba0ce25710b56224d16f8"
+	checksum: "db4633cec8add6d06cb6e16e27aca765"
 }
 bug-reports: "https://bitbucket.org/mimirops/pds/issues"
 dev-repo: "git@bitbucket.org:mimirops/pds.git"

          
M pds.mk +13 -13
@@ 77,19 77,19 @@ clean: $(tests_clean_release) $(tests_cl
 
 $(projects_release):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/release/$(patsubst release_%,%,$@) \
 	-C build/release/$(patsubst release_%,%,$@)
 
 $(projects_debug):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/debug \
+	OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/debug/$(patsubst debug_%,%,$@) \
 	-C build/debug/$(patsubst debug_%,%,$@) debug
 
 $(projects_profile):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/profile \
+	OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/profile/$(patsubst profile_%,%,$@) \
 	-C build/profile/$(patsubst profile_%,%,$@) profile
 

          
@@ 98,26 98,26 @@ clean: $(tests_clean_release) $(tests_cl
 
 $(tests_release):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-release/$(patsubst profile_%,%,$@) \
 	-C build/test-release/$(patsubst test-release_%,%,$@)
 
 $(tests_debug):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/debug \
+	OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-debug/$(patsubst profile_%,%,$@) \
 	-C build/test-debug/$(patsubst test-debug_%,%,$@)
 
 $(tests_profile):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/profile \
+	OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-profile/$(patsubst profile_%,%,$@) \
 	-C build/test-profile/$(patsubst test-profile_%,%,$@)
 
 $(projects_docs): $(projects_release)
 	mkdir -p $(shell pwd)/build/docs/$(patsubst docs_%,%,$@)
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/docs/$(patsubst docs_%,%,$@) \
 	-C build/release/$(patsubst docs_%,%,$@) docs
 

          
@@ 126,36 126,36 @@ clean: $(tests_clean_release) $(tests_cl
 
 $(projects_clean_release):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/release/$(patsubst clean-release_%,%,$@) \
 	-C build/release/$(patsubst clean-release_%,%,$@) clean
 
 $(projects_clean_debug):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/debug \
+	OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/debug/$(patsubst clean-debug_%,%,$@) \
 	-C build/debug/$(patsubst clean-debug_%,%,$@) clean
 
 $(projects_clean_profile):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/profile \
+	OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/profile/$(patsubst clean-profile_%,%,$@) \
 	-C build/profile/$(patsubst clean-profile_%,%,$@) clean
 
 $(tests_clean_release):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/release \
+	OCAMLPATH=$(shell pwd)/build/release:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-release/$(patsubst test-clean-release_%,%,$@) \
 	-C build/test-release/$(patsubst test-clean-release_%,%,$@) test-clean
 
 $(tests_clean_debug):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/debug \
+	OCAMLPATH=$(shell pwd)/build/debug:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-debug/$(patsubst test-clean-debug_%,%,$@) \
 	-C build/test-debug/$(patsubst test-clean-debug_%,%,$@) test-clean
 
 $(tests_clean_profile):
 	$(MAKE) \
-	OCAMLPATH=$(shell pwd)/build/profile \
+	OCAMLPATH=$(shell pwd)/build/profile:$(OCAMLPATH) \
 	BUILD_DIR=$(shell pwd)/build/test-profile/$(patsubst test-clean-profile_%,%,$@) \
 	-C build/test-profile/$(patsubst test-clean-profile_%,%,$@) test-clean