From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Mon, 26 Jun 2017 14:54:57 +0000 (+0200)
Subject: build-sys: fix chown mistake, add checkusage.sh to the dist
X-Git-Tag: v2.31-rc1~259^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=22174021f8255c4b06d528b93db31dc4d2a4a73c;p=thirdparty%2Futil-linux.git

build-sys: fix chown mistake, add checkusage.sh to the dist

Sorry, don't know why I reverted fad561b0.

But for travis we need it only in check_nonroot().
check_root() *can* do chown and the check_dist() is handled
by Makefile.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/.travis-functions.sh b/.travis-functions.sh
index 19162a8a7b..7b20e886c2 100755
--- a/.travis-functions.sh
+++ b/.travis-functions.sh
@@ -58,7 +58,6 @@ function check_root
 	local opts="$MAKE_CHECK_OPTS --parallel=1 --show-diff"
 
 	xconfigure \
-		--disable-makeinstall-chown \
 		--enable-all-programs \
 		|| return
 	$MAKE || return
@@ -73,7 +72,7 @@ function check_root
 
 function check_dist
 {
-	xconfigure --disable-makeinstall-chown \
+	xconfigure \
 		|| return
 	$MAKE distcheck || return
 }
diff --git a/Makefile.am b/Makefile.am
index 325d1f4fa1..54c85e16f8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -192,6 +192,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--disable-use-tty-group \
 	--disable-silent-rules \
 	--enable-all-programs \
+	--disable-makeinstall-chown \
 	--enable-static-programs \
 	--enable-gtk-doc \
 	--with-python \
diff --git a/tools/Makemodule.am b/tools/Makemodule.am
index 03f2be6bab..bc22926f14 100644
--- a/tools/Makemodule.am
+++ b/tools/Makemodule.am
@@ -6,4 +6,5 @@ EXTRA_DIST += \
        	tools/checkdecl.sh \
       	tools/checkincludes.pl \
 	tools/checkmans.sh \
+	tools/checkusage.sh \
        	tools/checkxalloc.sh