# HG changeset patch # User Malcolm Matalka # Date 1601584724 -7200 # Thu Oct 01 22:38:44 2020 +0200 # Node ID 400ece21ad7aed504562817698745f4e7db0d9bb # Parent 9131c8a9de1c97b975dbb3cadc24569e05a4d084 FIX OCAMLPATH is actually a colon separated list diff --git a/files/pds.mk.tmpl b/files/pds.mk.tmpl --- a/files/pds.mk.tmpl +++ b/files/pds.mk.tmpl @@ -83,19 +83,19 @@ $(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 @@ $(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 @@ $(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 diff --git a/opam/packages/pds/pds.99999/opam b/opam/packages/pds/pds.99999/opam --- a/opam/packages/pds/pds.99999/opam +++ b/opam/packages/pds/pds.99999/opam @@ -38,7 +38,7 @@ 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" diff --git a/pds.mk b/pds.mk --- a/pds.mk +++ b/pds.mk @@ -77,19 +77,19 @@ $(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 @@ $(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 @@ $(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