Work even with FreeBSD "make", which uses sh -e and thus errors-out if

a simple-command fails.

diff --git a/ChangeLog b/ChangeLog
index c27fb32f4d279dcdf1a813c1074c5f943b92ad10..dc3977b7e0dfed2443bb2c2be647bd9d6827067a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-05-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.am (fetch): Work even with FreeBSD "make", which
+       uses sh -e and thus errors-out if a simple-command fails.
+       * lib/am/check.am (check-TESTS): Likewise.
+       * lib/am/ltlib.am (clean-%DIR%LTLIBRARIES): Likewise.
+       * lib/am/tags.am (TAGS): Likewise.
+
 2004-05-13  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * tests/lex3.test, tests/yacc6.test: Require GNU Make.

diff --git a/Makefile.am b/Makefile.am
index 13fa036f3672dec6ce470d12c05a3d14495099bd..c9a6cf553bd9d7ec3993dcd26b46d7c334948c59 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -344,6 +344,6 @@ fetch:
            cp Fetchdir/$$file $(srcdir)/lib/$$file; \
          fi; \
        done; \
-       test $$stat = 1 && \
+       test $$stat = 0 || \
          echo "See Fetchdir/update.patch for a log of the changes."; \
        exit $$stat

diff --git a/lib/am/check.am b/lib/am/check.am
index 768bab714e3b9b86cd514f037d9d7aafc7278aec..6c624a990ffc07901a712c9b8ad2f7fcd93ee8f2 100644 (file)
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -80,20 +80,20 @@ check-TESTS: $(TESTS)
          skipped=""; \
          if test "$$skip" -ne 0; then \
            skipped="($$skip tests were not run)"; \
-           test `echo "$$skipped" | wc -c` -gt `echo "$$banner" | wc -c` && \
+           test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
              dashes="$$skipped"; \
          fi; \
          report=""; \
          if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
            report="Please report to $(PACKAGE_BUGREPORT)"; \
-           test `echo "$$report" | wc -c` -gt `echo "$$banner" | wc -c` && \
+           test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
              dashes="$$report"; \
          fi; \
          dashes=`echo "$$dashes" | sed s/./=/g`; \
          echo "$$dashes"; \
          echo "$$banner"; \
-         test -n "$$skipped" && echo "$$skipped"; \
-         test -n "$$report" && echo "$$report"; \
+         test -z "$$skipped" || echo "$$skipped"; \
+         test -z "$$report" || echo "$$report"; \
          echo "$$dashes"; \
          test "$$failed" -eq 0; \
        else :; fi

diff --git a/lib/am/ltlib.am b/lib/am/ltlib.am
index 0f6cc490ce2d50694e3821fa2f6f840684b61039..924a88276eeac25ea02d35113c81e1d336c7d2fa 100644 (file)
--- a/lib/am/ltlib.am
+++ b/lib/am/ltlib.am
@@ -86,7 +86,7 @@ clean-%DIR%LTLIBRARIES:
 ## directory where the shared object is created.
        @list='$(%DIR%_LTLIBRARIES)'; for p in $$list; do \
          dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-         test "$$dir" = "$$p" && dir=.; \
+         test "$$dir" != "$$p" || dir=.; \
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done

diff --git a/lib/am/tags.am b/lib/am/tags.am
index fabb8ad12c9fc4716a34a4b21930a4c46be05fdd..7afbdd3d8371b3ae49fca03db21818b4f2a7cc07 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -62,7 +62,7 @@ TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
 ?SUBDIRS?      list='$(SUBDIRS)'; for subdir in $$list; do \
 ## Do nothing if we're trying to look in `.'.
 ?SUBDIRS?        if test "$$subdir" = .; then :; else \
-?SUBDIRS?          test -f $$subdir/TAGS && \
+?SUBDIRS?          test ! -f $$subdir/TAGS || \
 ## Note that the = is mandatory for --etags-include.
 ?SUBDIRS?            tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
 ?SUBDIRS?        fi; \
@@ -77,7 +77,7 @@ TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
               END { for (i in files) print i; }'`; \
 ## Make sure we have something to run etags on.
        if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-         test -z "$$unique" && unique=$$empty_fix; \
+         test -n "$$unique" || unique=$$empty_fix; \
          $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
            $$tags $$unique; \
        fi