Minor bug and doc fixes

diff --git a/ChangeLog b/ChangeLog
index 85ace6f92d5f9bf35909e2d7c1db969dcc40c51b..e9cc01ea66ab028c7b9620fdc73369e59752a43d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Sat Dec  9 10:16:48 1995  Tom Tromey  <tromey@cambric.colorado.edu>
+
+       * tags.am (TAGS): Use "test -z ... ||" to avoid spurious
+       failures.
+
+       * texinfos.am (install-info): Don't do install-info for now.
+
+       * clean.am (distclean-generic): Don't remove config.status here.
+       * automake.in (do_one_clean_target): Remove config.status later,
+       for 'make -j2'.  From Jim Meyering.
+
 Fri Dec  8 16:30:48 1995  Tom Tromey  <tromey@cambric.colorado.edu>
 
        * configure.in (VERSION): Version 0.25.

diff --git a/Makefile.in b/Makefile.in
index d1ef43dae65179076d08ffb7e7acae9eaa49a48e..8b3d003ad7ecfc043eb3b3a303f8fee99bb7266a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 0.24 from Makefile.am
+# Makefile.in generated automatically by automake 0.25 from Makefile.am
 # Copyright (C) 1994, 1995 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -157,8 +157,6 @@ install-info: $(INFO_DEPS)
          for ifile in $${file}*; do            \
            $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
          done;                                 \
-         $(SHELL) -c 'install-info --version' >/dev/null 2>&1 \
-           && install-info --infodir=$(infodir) $$d/$$file; \
        done
 
 uninstall-info:
@@ -272,7 +270,7 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log config.status $(CONFIG_HEADER) stamp-h
+       rm -f config.cache config.log $(CONFIG_HEADER) stamp-h
 
 maintainer-clean-generic:
        test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
@@ -282,6 +280,7 @@ mostlyclean: mostlyclean-binSCRIPTS mostlyclean-vti mostlyclean-info mostlyclean
 clean: mostlyclean clean-binSCRIPTS clean-vti clean-info clean-tags clean-generic
 
 distclean: clean distclean-binSCRIPTS distclean-vti distclean-info distclean-tags distclean-generic
+       rm -f config.status
 
 maintainer-clean: distclean maintainer-clean-binSCRIPTS maintainer-clean-vti maintainer-clean-info maintainer-clean-tags maintainer-clean-generic
        @echo "This command is intended for maintainers to use;"

diff --git a/automake.in b/automake.in
index 90d8eb77f1ee15d6987823890d060f5f1f295297..22055fe121f6b7ecfdfac5c68983299781621f42 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1000,6 +1000,11 @@ sub do_one_clean_target
             . "\t\@echo \"it deletes files that may require special "
             . "tools to rebuild.\"\n");
     }
+    elsif ($name . $target eq 'distclean'
+          || $name . $tar eq 'maintainer-clean')
+    {
+       $output_rules .= "\trm -f config.status\n";
+    }
     $output_rules .= "\n";
 }
 
@@ -1264,7 +1269,6 @@ sub file_contents
     }
 
     # Lines starting with "##" are comments for developer use only.
-    # Maybe this is a bad idea?
     local ($result) = '';
     while (<FC_FILE>)
     {

diff --git a/automake.texi b/automake.texi
index 43be0f88765f7991c42f08772b683181428de70d..955b379c04ba9f7fa52f5099c9587860008cb980 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -228,7 +228,7 @@ cpio is a good example of such a package (as is GNU @code{tar}, although
 it does not presently use @code{automake}).  The top level
 @file{Makefile.am} for a deep package will contain a @samp{SUBDIRS}
 macro, but no other macros to define objects which are built.
-Typically, @samp{PRGORAMS} is defined in @file{src/Makefile.am}.
+Typically, @samp{PROGRAMS} is defined in @file{src/Makefile.am}.
 
 A shallow package is one in which the primary source resides in the
 top-level directory, while various parts (typically libraries) reside in
@@ -242,7 +242,7 @@ the generated @file{Makefile} will run both locally and in all specified
 subdirectories.  Note that the directories listed in @samp{SUBDIRS} are
 not expected to contain @file{Makefile.am}s; only @file{Makefile}s
 (after configuration).  This allows inclusion of libraries from packages
-which do not use @code{automake} (such as gettext).
+which do not use @code{automake} (such as @code{gettext}).
 
 If @samp{SUBDIRS} is defined, then your @file{configure.in} must include
 @code{AC_PROG_MAKE_SET}.

diff --git a/clean.am b/clean.am
index 69a015ba32cb76a7fced0f37a7fb4315214c7ced..927272bdf3e53531bb10e5bff962d79d94ae8c58 100644 (file)
--- a/clean.am
+++ b/clean.am
@@ -8,7 +8,7 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log config.status $(CONFIG_HEADER) stamp-h
+       rm -f config.cache config.log $(CONFIG_HEADER) stamp-h
 
 maintainer-clean-generic:
        test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)

diff --git a/lib/am/clean.am b/lib/am/clean.am
index 69a015ba32cb76a7fced0f37a7fb4315214c7ced..927272bdf3e53531bb10e5bff962d79d94ae8c58 100644 (file)
--- a/lib/am/clean.am
+++ b/lib/am/clean.am
@@ -8,7 +8,7 @@ clean-generic:
 
 distclean-generic:
        rm -f Makefile $(DISTCLEANFILES)
-       rm -f config.cache config.log config.status $(CONFIG_HEADER) stamp-h
+       rm -f config.cache config.log $(CONFIG_HEADER) stamp-h
 
 maintainer-clean-generic:
        test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)

diff --git a/lib/am/tags.am b/lib/am/tags.am
index a01bd8da26ffac7c85bbc48cf2c0e3111d0404e4..0b718ed924621e6ed1dfa7f3cab1fc9a5edbe1ee 100644 (file)
--- a/lib/am/tags.am
+++ b/lib/am/tags.am
@@ -10,8 +10,7 @@ TAGS:
            tags="$$tags -i $$here/$$subdir/TAGS"; \
          }                                     \
        done;                                   \
-## Make sure we have something to run etags on.  See clean.am to
-## understand "if...else" braindamage.
-       test -n "$(ETAGS_ARGS)$(CONFIG_HEADER)$(SOURCES)$(HEADERS)$$tags" \
-         && etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER) $(SOURCES) $(HEADERS)
+## Make sure we have something to run etags on.
+       test -z "$(ETAGS_ARGS)$(CONFIG_HEADER)$(SOURCES)$(HEADERS)$$tags" \
+         || etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER) $(SOURCES) $(HEADERS)
 

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 7735374b72474636229604256062bec66b004bff..de68ff5c309942a55ae7c3a16e4859b31c470c04 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -19,8 +19,12 @@ install-info: $(INFO_DEPS)
          for ifile in $${file}*; do            \
            $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
          done;                                 \
-         $(SHELL) -c 'install-info --version' >/dev/null 2>&1 \
-           && install-info --infodir=$(infodir) $$d/$$file; \
+## We need the 'else true' because in some broken versions of sh 'if'
+## will return false if the test fails.
+## FIXME no one has install-info, so for now we just comment it out.
+##       if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+##         install-info --infodir=$(infodir) $$d/$$file; \
+##       else true; fi;                        \
        done
 
 uninstall-info:

diff --git a/tags.am b/tags.am
index a01bd8da26ffac7c85bbc48cf2c0e3111d0404e4..0b718ed924621e6ed1dfa7f3cab1fc9a5edbe1ee 100644 (file)
--- a/tags.am
+++ b/tags.am
@@ -10,8 +10,7 @@ TAGS:
            tags="$$tags -i $$here/$$subdir/TAGS"; \
          }                                     \
        done;                                   \
-## Make sure we have something to run etags on.  See clean.am to
-## understand "if...else" braindamage.
-       test -n "$(ETAGS_ARGS)$(CONFIG_HEADER)$(SOURCES)$(HEADERS)$$tags" \
-         && etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER) $(SOURCES) $(HEADERS)
+## Make sure we have something to run etags on.
+       test -z "$(ETAGS_ARGS)$(CONFIG_HEADER)$(SOURCES)$(HEADERS)$$tags" \
+         || etags $(ETAGS_ARGS) $$tags $(CONFIG_HEADER) $(SOURCES) $(HEADERS)
 

diff --git a/texinfos.am b/texinfos.am
index 7735374b72474636229604256062bec66b004bff..de68ff5c309942a55ae7c3a16e4859b31c470c04 100644 (file)
--- a/texinfos.am
+++ b/texinfos.am
@@ -19,8 +19,12 @@ install-info: $(INFO_DEPS)
          for ifile in $${file}*; do            \
            $(INSTALL_DATA) $$d/$$ifile $(infodir)/$$ifile; \
          done;                                 \
-         $(SHELL) -c 'install-info --version' >/dev/null 2>&1 \
-           && install-info --infodir=$(infodir) $$d/$$file; \
+## We need the 'else true' because in some broken versions of sh 'if'
+## will return false if the test fails.
+## FIXME no one has install-info, so for now we just comment it out.
+##       if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \
+##         install-info --infodir=$(infodir) $$d/$$file; \
+##       else true; fi;                        \
        done
 
 uninstall-info:

diff --git a/version.texi b/version.texi
index b9a5d872edea92e710719db0b8a103792c535cd9..21f5a344a2c915f0d261895804aaab3879b3f458 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 8 December
+@set UPDATED 9 December
 @set EDITION 0.25
 @set VERSION 0.25