diff options
| author | Karel Zak | 2017-06-26 22:42:24 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-06-26 22:42:24 +0200 |
| commit | b768ac6b60a87226812d60267a9df6577be7a4a4 (patch) | |
| tree | 57610fb5d5a426dfc9280b4481a1df29ada2304a | |
| parent | uuidparse: fix getopt crash (diff) | |
| parent | build-sys: fix chown mistake, add checkusage.sh to the dist (diff) | |
| download | kernel-qcow2-util-linux-b768ac6b60a87226812d60267a9df6577be7a4a4.tar.gz kernel-qcow2-util-linux-b768ac6b60a87226812d60267a9df6577be7a4a4.tar.xz kernel-qcow2-util-linux-b768ac6b60a87226812d60267a9df6577be7a4a4.zip | |
Merge branch 'travis-fix' of https://github.com/rudimeier/util-linux
* 'travis-fix' of https://github.com/rudimeier/util-linux:
build-sys: fix chown mistake, add checkusage.sh to the dist
| -rwxr-xr-x | .travis-functions.sh | 3 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | tools/Makemodule.am | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/.travis-functions.sh b/.travis-functions.sh index 19162a8a7..7b20e886c 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 325d1f4fa..54c85e16f 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 03f2be6ba..bc22926f1 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 |