* Makefile.am: Remove INSTALL.txt by maintainer-clean target.

diff --git a/ChangeLog b/ChangeLog
index 8344437aeeb37e9fbb3d3484c893ae73dfa91141..82f7a525fddcaa51435a416b62a4bab35778de73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-07-19  Peter Eisentraut  <peter_e@gmx.net>
+
+       * Makefile.am: Remove INSTALL.txt by maintainer-clean target.
+
 2000-07-19  Akim Demaille  <akim@epita.fr>
 
        * autoupdate.sh: Typo: s/infile/file/.

diff --git a/Makefile.am b/Makefile.am
index f060bd5e701219297c5115053173a8c41eedb2cb..1ed8a10a3ce3922746048408fb9eaf8f2a413f03 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,8 @@ install-data-hook: INSTALL.txt
          $(INSTALL_DATA) $$d$$p.txt $(DESTDIR)$(pkgdatadir)/$$f; \
        done
 
+MAINTAINERCLEANFILES = INSTALL.txt
+
 # The scripts.
 
 editsh = sed \

diff --git a/Makefile.in b/Makefile.in
index 4d54c77eabab5e88cb1d4270c08492da3a53725a..b83dff3354da121ad28f69ecd0362ddc3203f310 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -96,6 +96,8 @@ EXTRA_DIST = $(OLDCHANGELOGS) autoconf.sh autoheader.sh autoreconf.sh autoupdate
 CLEANFILES = autoconf.m4f              $(bin_SCRIPTS)
 
 
+MAINTAINERCLEANFILES = INSTALL.txt
+
 # The scripts.
 
 editsh = sed   -e 's,@''datadir''@,$(pkgdatadir),g'    -e 's,@''M4''@,$(M4),g'         -e 's,@''AWK''@,$(AWK),g'       -e 's,@''SHELL''@,$(SHELL),g'   -e 's,@''VERSION''@,$(VERSION),g'       -e 's,@''PACKAGE''@,$(PACKAGE),g'       -e 's,@autoconf-name@,'`echo autoconf | sed '$(transform)'`',g'         -e 's,@autoheader-name@,'`echo autoheader | sed '$(transform)'`',g'
@@ -378,6 +380,7 @@ distclean-generic:
        -rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
+       -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-tags mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive

diff --git a/doc/standards.texi b/doc/standards.texi
index e927764d7ae85d0bef0830ac1e03fcfc796e44c2..541f6d57bcc67d1245d58bc0273ba743d2052a2c 100644 (file)
--- a/doc/standards.texi
+++ b/doc/standards.texi
@@ -1194,7 +1194,7 @@ Used to ask for brief usage information.
 @samp{-q} in @code{ls}.
 
 @item html
-In @code{makeinfo}, output HTML.  
+In @code{makeinfo}, output HTML.
 
 @item idle
 @samp{-u} in @code{who}.
@@ -2890,10 +2890,10 @@ inconsistencies between different parts of a program, by giving you a
 history of how the conflicting concepts arose and who they came from.
 
 @menu
-* Change Log Concepts::         
-* Style of Change Logs::        
-* Simple Changes::              
-* Conditional Changes::         
+* Change Log Concepts::
+* Style of Change Logs::
+* Simple Changes::
+* Conditional Changes::
 * Indicating the Part Changed::
 @end menu
 
@@ -3223,10 +3223,10 @@ to work with @var{package}.
 @c  Giving an optional @var{parameter} of
 @c @samp{no} should omit @var{package}, if it is used by default.
 
-Possible values of @var{package} include 
+Possible values of @var{package} include
 @samp{gnu-as} (or @samp{gas}), @samp{gnu-ld}, @samp{gnu-libc},
 @samp{gdb},
-@samp{x}, 
+@samp{x},
 and
 @samp{x-toolkit}.