Make sure that generated ocaml-link.sh is used in out-of-tree builds

Gbp-Pq: Name Make-sure-that-generated-ocaml-link.sh-is-used-in-out-of-.patch

diff --git a/common/mlpcre/Makefile.am b/common/mlpcre/Makefile.am
index a1d8b0293fff5661191c6de20bd57e4103e10131..3636a46c23c48f4e399a843f2986a4e608faa0b5 100644 (file)
--- a/common/mlpcre/Makefile.am
+++ b/common/mlpcre/Makefile.am
@@ -106,9 +106,9 @@ OCAMLLINKFLAGS = $(LINK_CUSTOM_OCAMLC_ONLY)
 pcre_tests_DEPENDENCIES = \
        $(pcre_tests_THEOBJECTS) \
        $(MLPCRE_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 pcre_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh \
+       $(top_builddir)/ocaml-link.sh \
          -cclib '-pthread -lpthread -lutils -lpcre2-8 -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \

diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am
index ea314e48babe638c77b944bc66b4fc812936d4eb..7fd8c06eb74d347c5d4a9a5f88d56259429062da 100644 (file)
--- a/common/mlstdutils/Makefile.am
+++ b/common/mlstdutils/Makefile.am
@@ -117,9 +117,9 @@ OCAMLLINKFLAGS = $(LINK_CUSTOM_OCAMLC_ONLY)
 std_utils_tests_DEPENDENCIES = \
        $(std_utils_tests_THEOBJECTS) \
        $(MLSTDUTILS_CMA) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 std_utils_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -- \
+       $(top_builddir)/ocaml-link.sh -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLLINKFLAGS) \
          $(OCAMLPACKAGES) $(OCAMLPACKAGES_TESTS) \
          $(std_utils_tests_THEOBJECTS) -o $@

diff --git a/common/mlutils/Makefile.am b/common/mlutils/Makefile.am
index 17dfac3f400b60ccb7a02f5e6d93eb06a2230034..2f58123fab3f0f038624a306d5624db1203a6067 100644 (file)
--- a/common/mlutils/Makefile.am
+++ b/common/mlutils/Makefile.am
@@ -127,9 +127,9 @@ c_utils_unit_tests_DEPENDENCIES = \
        $(c_utils_unit_tests_THEOBJECTS) \
        ../mlstdutils/mlstdutils.$(MLARCHIVE) \
        mlcutils.$(MLARCHIVE) \
-       $(top_srcdir)/ocaml-link.sh
+       $(top_builddir)/ocaml-link.sh
 c_utils_unit_tests_LINK = \
-       $(top_srcdir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
+       $(top_builddir)/ocaml-link.sh -cclib '-lutils -lgnu' -- \
          $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) \
          $(OCAMLPACKAGES) -package ounit2 \
          $(OCAMLLINKFLAGS) \