From 585513bdfa225fa52814a1ee78a707b861b2d458 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 10 Jan 1999 20:39:23 +0000 Subject: [PATCH] * 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. --- ChangeLog | 10 ++++++++++ THANKS | 1 + automake.in | 13 +++++++++++-- lib/am/texi-vers.am | 7 +++---- stamp-vti | 2 +- texi-vers.am | 7 +++---- version.texi | 2 +- 7 files changed, 30 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5b1c0ba9..ef758159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +1999-01-10 Tom Tromey + + * 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 * depend.am: remove the dependencies (.deps) diff --git a/THANKS b/THANKS index ada028df..f1eb16dc 100644 --- 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 3d5e3953..f155ff6c 100755 --- 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 30124aed..f7b4e0e3 100644 --- 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 7fdc2167..2adaa918 100644 --- 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 30124aed..f7b4e0e3 100644 --- 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 7fdc2167..2adaa918 100644 --- 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 -- 2.43.5