Make "make distcheck" happy and allow builddir != srcdir

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile.am b/Makefile.am
index bc6fecdf6e25b0571a32e8ccdda4d707e59630b8..8d4898be022781d9d585cf4c9bce36a0bebf98ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -431,13 +431,16 @@ uninstall-hook: $(UNINSTALL_EXEC_HOOKS)
 # - testsuite ------------------------------------------------------------------
 
 TESTS_ENVIRONMENT = \
-       PATH="$(top_builddir)/src:$(PATH)" \
-       topdir="$(shell pwd)" \
-       networkdir="$(top_srcdir)/src/functions" \
-       testdir="$(top_srcdir)/test"
+       PATH=$(top_builddir)/src:$(PATH) \
+       functions=$(abs_builddir)/src/functions/functions \
+       networkdir=$(abs_srcdir)/src/functions \
+       testdir=$(top_srcdir)/test
+
+dist_check_DATA = \
+       test/constants.sh
 
 dist_check_SCRIPTS = \
-       test/load-library
+       $(TESTS)
 
 TESTS = \
        test/load-library \

diff --git a/test/functions/ip/ip_detect_protocol b/test/functions/ip/ip_detect_protocol
index 47403f35d231bf333f72b803cb0615e7f8970f6c..653dc7f50688651c543bf93707dec41096f0292c 100755 (executable)
--- a/test/functions/ip/ip_detect_protocol
+++ b/test/functions/ip/ip_detect_protocol
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 . ${testdir}/constants.sh
 

diff --git a/test/functions/ip/ip_get_prefix b/test/functions/ip/ip_get_prefix
index 3b0ad6072bc63b9e65967348aba3a0b0bf7d2ecc..be979bf6d4b5f248d4047722a40cedc1918ccfea 100755 (executable)
--- a/test/functions/ip/ip_get_prefix
+++ b/test/functions/ip/ip_get_prefix
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 . ${testdir}/constants.sh
 

diff --git a/test/functions/ip/ip_is_network b/test/functions/ip/ip_is_network
index 6570ad28755131a33eb03f5804498b3fac67511d..9e9a546f66b515dab85ee860e4b65d52e3046e3f 100755 (executable)
--- a/test/functions/ip/ip_is_network
+++ b/test/functions/ip/ip_is_network
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 . ${testdir}/constants.sh
 

diff --git a/test/functions/ip/ip_is_valid b/test/functions/ip/ip_is_valid
index d653c9b46a903ccc7c50a191d08b671f37f0549d..5d80c9e82fd8092094a3682e1f800b88c857d81d 100755 (executable)
--- a/test/functions/ip/ip_is_valid
+++ b/test/functions/ip/ip_is_valid
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 . ${testdir}/constants.sh
 

diff --git a/test/functions/ip/ip_prefix_is_valid b/test/functions/ip/ip_prefix_is_valid
index 7b22309b0a4d21d91217a2ae676f28dbac9903ba..bc0d1c486549e6095ec07459382b03e7644284d7 100755 (executable)
--- a/test/functions/ip/ip_prefix_is_valid
+++ b/test/functions/ip/ip_prefix_is_valid
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 . ${testdir}/constants.sh
 

diff --git a/test/functions/ip/ip_protocol_is_supported b/test/functions/ip/ip_protocol_is_supported
index 39acf656eaa87c9feff5d4b4efdc31d694a9f324..d84b93c409557d3bac9ff801b99a1a10618ba63c 100755 (executable)
--- a/test/functions/ip/ip_protocol_is_supported
+++ b/test/functions/ip/ip_protocol_is_supported
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 . ${testdir}/constants.sh
 

diff --git a/test/functions/ip/ip_split_prefix b/test/functions/ip/ip_split_prefix
index b8da3d4341393a354ff66ed989d40fe6e8d5c0ed..88ed779478ec2639dea263e95ab585b01365f6d6 100755 (executable)
--- a/test/functions/ip/ip_split_prefix
+++ b/test/functions/ip/ip_split_prefix
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 . ${testdir}/constants.sh
 

diff --git a/test/load-library b/test/load-library
index 16f1d95b1dcb4d730a6fcef635f10769db8c9a6e..d600f528d8a9fed94b1bf51bbaf92328a2e76fa8 100755 (executable)
--- a/test/load-library
+++ b/test/load-library
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 if [ -n "${NETWORK_VERSION}" ]; then
        exit 0