From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 31 May 2017 21:20:47 +0000 (+0100)
Subject: Make "make distcheck" happy and allow builddir != srcdir
X-Git-Tag: 009~246
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8744a476c00df4eeb2ff3c891e7a96989fd14ef4;p=people%2Fms%2Fnetwork.git

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 bc6fecdf..8d4898be 100644
--- 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 47403f35..653dc7f5 100755
--- 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 3b0ad607..be979bf6 100755
--- 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 6570ad28..9e9a546f 100755
--- 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 d653c9b4..5d80c9e8 100755
--- 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 7b22309b..bc0d1c48 100755
--- 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 39acf656..d84b93c4 100755
--- 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 b8da3d43..88ed7794 100755
--- 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 16f1d95b..d600f528 100755
--- a/test/load-library
+++ b/test/load-library
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-. ${networkdir}/functions
+. ${functions}
 
 if [ -n "${NETWORK_VERSION}" ]; then
 	exit 0