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 19162a8a7b3b144297b826db0b4949603780731f..7b20e886c24b9136f045a5e3c380d43d36d860be 100755 (executable)
--- 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 325d1f4fa1fdb9c3748bf315c3a600326c88bda7..54c85e16f841e8493e9ad27a8a2e760c6d164503 100644 (file)
--- 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 03f2be6bab19cb1a9ce644bd62a5716ae35d5656..bc22926f144207afb378cbe80a4a734a3d26037b 100644 (file)
--- 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