diff options
| author | Alan Jenkins <alan-jenkins@tuffmail.co.uk> | 2010-05-04 01:10:01 -0400 |
|---|---|---|
| committer | Jon Masters <jcm@jonmasters.org> | 2010-05-04 01:10:01 -0400 |
| commit | 54c954fcffb7aac59f125b23ec08046d2b6e66f2 (patch) | |
| tree | e8c79b4ef54d9368c124b107bbcb9565b2db7219 | |
| parent | 3ad3131cb10639a35f9e80000717b629a90fe900 (diff) | |
| download | module-init-tools-54c954fcffb7aac59f125b23ec08046d2b6e66f2.tar.gz | |
build: handle old (System V) style wc output
wc -w may output " 0" instead of "0". Handle this using an integer
comparison (instead of a string comparison).
Signed-off-by: Jon Masters <jcm@jonmasters.org>
| -rw-r--r-- | m4/ax_enable_builddir.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/m4/ax_enable_builddir.m4 b/m4/ax_enable_builddir.m4 index 4273a53..a7b67e8 100644 --- a/m4/ax_enable_builddir.m4 +++ b/m4/ax_enable_builddir.m4 @@ -206,7 +206,7 @@ a\\ ; test ".\$\$HOST" = "." && HOST=$x sh $AUX/config.guess $x \\\\\\ ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ ; use=$x basename "\$\@" _ALL $x; n=$x echo \$\$BUILD | wc -w $x \\\\\\ - ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" = "0" ; then : \\\\\\ + ; echo "MAKE \$\$HOST : \$\$n * \$\@"; if test "\$\$n" -eq "0" ; then : \\\\\\ ; BUILD=$x grep "^####.*|" Makefile |tail -1| sed -e 's/.*|//' $x ; fi \\\\\\ ; test ".\$\$BUILD" = "." && BUILD="." \\\\\\ ; test "\$\$use" = "\$\@" && BUILD=$x echo "\$\$BUILD" | tail -1 $x \\\\\\ @@ -219,7 +219,7 @@ dnl special rule add-on: "dist" copies the tarball to $(PUB). (source tree) ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).tar.*" \\\\\\ - ; if test "\$\$found" = "0" ; then : \\\\\\ + ; if test "\$\$found" -eq "0" ; then : \\\\\\ ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).tar.* \\\\\\ @@ -231,7 +231,7 @@ dnl special rule add-on: "dist-foo" copies all the archives to $(PUB). (source t ; BUILD=$x grep "^#### \$\$HOST " Makefile | sed -e 's/.*|//' $x \\\\\\ ; found=$x echo \$\$BUILD | wc -w $x \\\\\\ ; echo "MAKE \$\$HOST : \$\$found \$(PACKAGE)-\$(VERSION).*" \\\\\\ - ; if test "\$\$found" = "0" ; then : \\\\\\ + ; if test "\$\$found" -eq "0" ; then : \\\\\\ ; BUILD=$x grep "^#### .*|" Makefile |tail -1| sed -e 's/.*|//' $x \\\\\\ ; fi ; for i in \$\$BUILD ; do test ".\$\$i" = "." && continue \\\\\\ ; for f in \$\$i/\$(PACKAGE)-\$(VERSION).* \\\\\\ |