fixlet

diff --git a/ChangeLog b/ChangeLog
index a3edfb3d1fa777765865da1b69e8f987bdf38d4d..329233352302695e794811c89bb33dc425751004 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jun 22 14:01:59 1997  Tom Tromey  <tromey@cygnus.com>
+
+       * texinfos.am: Use ||, not ;.
+
 Tue Jun 10 11:04:16 1997  Tom Tromey  <tromey@cygnus.com>
 
        * m4/cygwin.m4: Examine output of compiler to see if .exe needed.

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 8998cee09fec0cb5603d61711c0719ca3a17961d..c19e3769f321567f992f79392ef485865a42a8b3 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -124,7 +124,9 @@ NOTCYGNUS     d=$(srcdir); \
 ## think instead it should create a new dir file for you.  This bug
 ## causes the `make distcheck' target to fail reliably.
            echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
-           install-info --info-dir=$(infodir) $(infodir)/$$file; :;\
+## Use `|| :' here because Sun make passes -e to sh; if install-info
+## fails then we'd fail if we used `;'.
+           install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
          done; \
        else : ; fi
 

diff --git a/texinfos.am b/texinfos.am
index 8998cee09fec0cb5603d61711c0719ca3a17961d..c19e3769f321567f992f79392ef485865a42a8b3 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -124,7 +124,9 @@ NOTCYGNUS     d=$(srcdir); \
 ## think instead it should create a new dir file for you.  This bug
 ## causes the `make distcheck' target to fail reliably.
            echo " install-info --info-dir=$(infodir) $(infodir)/$$file";\
-           install-info --info-dir=$(infodir) $(infodir)/$$file; :;\
+## Use `|| :' here because Sun make passes -e to sh; if install-info
+## fails then we'd fail if we used `;'.
+           install-info --info-dir=$(infodir) $(infodir)/$$file || :;\
          done; \
        else : ; fi