* automake.in (handle_texinfo): Set $conf_pat correctly when

	config_aux_dir not used.
	(handle_texinfo): Run maintainer-clean-aminfo rules in srcdir.
	From Erez Zadok.
	* texi-vers.am (maintainer-clean-@VTI@): Prefix file names with
	$(srcdir).  From Erez Zadok.
	($(srcdir)/stamp-@VTI@): Don't run mdate-sh from srcdir.

diff --git a/ChangeLog b/ChangeLog
index 5b1c0ba9d23555397a737c3703088614811e79cf..ef758159028667402bec2d541a1d9619b6e1309e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1999-01-10  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.in (handle_texinfo): Set $conf_pat correctly when
+       config_aux_dir not used.
+       (handle_texinfo): Run maintainer-clean-aminfo rules in srcdir.
+       From Erez Zadok.
+       * texi-vers.am (maintainer-clean-@VTI@): Prefix file names with
+       $(srcdir).  From Erez Zadok.
+       ($(srcdir)/stamp-@VTI@): Don't run mdate-sh from srcdir.
+
 1999-01-08  Thomas Tanner  <tanner@gmx.de>
 
        * depend.am: remove the dependencies (.deps)

diff --git a/THANKS b/THANKS
index ada028dfde3b28f60e527c4046d0d32c48d6aaf8..f1eb16dc80ba377814c4228bd418eb9f85b72f2c 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -19,6 +19,7 @@ David Zaroski         cz253@cleveland.Freenet.Edu
 Dieter Baron           dillo@stieltjes.smc.univie.ac.at
 Doug Evans             devans@cygnus.com
 Eleftherios Gkioulekas lf@amath.washington.edu
+Erez Zadok             ezk@cs.columbia.edu
 Erick Branderhorst     branderh@iaehv.nl
 François Pinard                pinard@iro.umontreal.ca
 Fred Fish              fnf@ninemoons.com

diff --git a/automake.in b/automake.in
index 3d5e39531e10a6dff5c6d397fbb2990f31b13874..f155ff6c9a6a4eb312045e34a68a0623866ba1f9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -1928,8 +1928,16 @@ sub handle_texinfo
                if ! $done;
            ++$done;
 
-           local ($conf_pat);
-           ($conf_pat = $config_aux_dir) =~ s/(\W)/\\$1/g;
+           local ($conf_pat, $conf_dir);
+           if ($config_aux_dir eq '.')
+           {
+               $conf_dir = '$(srcdir)/';
+           }
+           else
+           {
+               $conf_dir = $config_aux_dir;
+           }
+           ($conf_pat = $conf_dir) =~ s/(\W)/\\$1/g;
            $output_rules .=
                &file_contents_with_transform
                    ('s/\@TEXI\@/' . $info_cursor . '/g; '
@@ -2040,6 +2048,7 @@ sub handle_texinfo
                      . "maintainer-clean-aminfo:\n\t"
                      # Eww.  But how else can we find all the output
                      # files from makeinfo?
+                     . ($cygnus_mode ? '' : 'cd $(srcdir) && ')
                      . 'for i in $(INFO_DEPS); do' . " \\\n"
                      . "\t" . '  rm -f $$i;' . " \\\n"
                      . "\t" . '  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then' . " \\\n"

diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am
index 30124aeda343cffd123b53855e8d2b5768dcb0b0..f7b4e0e371d87a7def06e4674b90a143b9b6114a 100644 (file)
--- a/lib/am/texi-vers.am
+++ b/lib/am/texi-vers.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,8 +21,7 @@ $(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@stamp-@VTI@
 ## Depend on configure.in so that version number updates cause a
 ## rebuild.
 $(srcdir)/stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
-       @echo "@set UPDATED `cd $(srcdir) \
-         && $(SHELL) @MDDIR@/mdate-sh @TEXI@`" > @VTI@.tmp
+       @echo "@set UPDATED `$(SHELL) @MDDIR@/mdate-sh @TEXI@`" > @VTI@.tmp
        @echo "@set EDITION $(VERSION)" >> @VTI@.tmp
        @echo "@set VERSION $(VERSION)" >> @VTI@.tmp
 ## Use cp and rm here because some older "mv"s can't move across
@@ -42,5 +41,5 @@ clean-@VTI@:
 distclean-@VTI@:
 
 maintainer-clean-@VTI@:
-       -@MAINTAINER_MODE_TRUE@rm -f stamp-@VTI@ @VTEXI@
+       -@MAINTAINER_MODE_TRUE@rm -f $(srcdir)/stamp-@VTI@ $(srcdir)/@VTEXI@
 

diff --git a/stamp-vti b/stamp-vti
index 7fdc2167b161865236fce01227a93f77c7374e02..2adaa91815d9ba35c56206447bed42a0d118edda 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,3 +1,3 @@
-@set UPDATED 6 January 1999
+@set UPDATED 10 January 1999
 @set EDITION 1.3e
 @set VERSION 1.3e

diff --git a/texi-vers.am b/texi-vers.am
index 30124aeda343cffd123b53855e8d2b5768dcb0b0..f7b4e0e371d87a7def06e4674b90a143b9b6114a 100644 (file)
--- a/texi-vers.am
+++ b/texi-vers.am
@@ -1,5 +1,5 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1994, 1995, 1996, 1998 Free Software Foundation, Inc.
+## Copyright (C) 1994, 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,8 +21,7 @@ $(srcdir)/@VTEXI@: @MAINTAINER_MODE_TRUE@stamp-@VTI@
 ## Depend on configure.in so that version number updates cause a
 ## rebuild.
 $(srcdir)/stamp-@VTI@: @TEXI@ $(top_srcdir)/configure.in
-       @echo "@set UPDATED `cd $(srcdir) \
-         && $(SHELL) @MDDIR@/mdate-sh @TEXI@`" > @VTI@.tmp
+       @echo "@set UPDATED `$(SHELL) @MDDIR@/mdate-sh @TEXI@`" > @VTI@.tmp
        @echo "@set EDITION $(VERSION)" >> @VTI@.tmp
        @echo "@set VERSION $(VERSION)" >> @VTI@.tmp
 ## Use cp and rm here because some older "mv"s can't move across
@@ -42,5 +41,5 @@ clean-@VTI@:
 distclean-@VTI@:
 
 maintainer-clean-@VTI@:
-       -@MAINTAINER_MODE_TRUE@rm -f stamp-@VTI@ @VTEXI@
+       -@MAINTAINER_MODE_TRUE@rm -f $(srcdir)/stamp-@VTI@ $(srcdir)/@VTEXI@
 

diff --git a/version.texi b/version.texi
index 7fdc2167b161865236fce01227a93f77c7374e02..2adaa91815d9ba35c56206447bed42a0d118edda 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,3 +1,3 @@
-@set UPDATED 6 January 1999
+@set UPDATED 10 January 1999
 @set EDITION 1.3e
 @set VERSION 1.3e