* m4/init.m4 (AM_INIT_AUTOMAKE): Properly quote AC_PACKAGE_TARNAME

and AC_PACKAGE_VERSION.

diff --git a/ChangeLog b/ChangeLog
index 157776879a7dcfd2f761da7e9c06b4e6743e3007..c95aef1fd36e8f9b08d66e8f9573ab945dba3b41 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-12-11  Brian Ford  <ford@vss.fsi.com>
+
+       * m4/init.m4 (AM_INIT_AUTOMAKE): Properly quote AC_PACKAGE_TARNAME
+       and AC_PACKAGE_VERSION.
+
 2002-12-11  Alexandre Duret-Lutz  <adl@gnu.org>
 
        * automake.texi (ANSI): Since Autoconf 2.54, LIBOBJ and LTLIBOBJ

diff --git a/Makefile.in b/Makefile.in
index 9ff825ecce7c22bd22a6080c48cc79183d9079bc..d64d8fb3d1f6cac2fa996db076d63dcfcd60acc6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -244,16 +244,18 @@ uninstall-info-am:
             install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
-           echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file"; \
-           install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$file; \
+           relfile=`echo "$$file" | sed 's|^.*/||'`; \
+           echo " install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile"; \
+           install-info --info-dir=$(DESTDIR)$(infodir) --remove $(DESTDIR)$(infodir)/$$relfile; \
          done; \
        else :; fi
        @$(NORMAL_UNINSTALL)
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
+         relfile=`echo "$$file" | sed 's|^.*/||'`; \
          (if cd $(DESTDIR)$(infodir); then \
-            echo " rm -f $$file $$file-[0-9] $$file-[0-9][0-9])"; \
-            rm -f $$file $$file-[0-9] $$file-[0-9][0-9]; \
+            echo " rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9])"; \
+            rm -f $$relfile $$relfile-[0-9] $$relfile-[0-9][0-9]; \
           else :; fi); \
        done
 
@@ -596,9 +598,9 @@ install-info-am: $(INFO_DEPS)
        @list='$(INFO_DEPS)'; \
        for file in $$list; do \
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
-         for ifile in echo $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
+         for ifile in $$d/$$file $$d/$$file-[0-9] $$d/$$file-[0-9][0-9]; do \
            if test -f $$ifile; then \
-             relfile=`expr "$$ifile" : "$$d/\(.*\)"`; \
+             relfile=`echo "$$ifile" | sed 's|^.*/||'`; \
              echo " $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile"; \
              $(INSTALL_DATA) $$ifile $(DESTDIR)$(infodir)/$$relfile; \
            else : ; fi; \
@@ -609,8 +611,9 @@ install-info-am: $(INFO_DEPS)
             install-info --version | grep -i -v debian) >/dev/null 2>&1; then \
          list='$(INFO_DEPS)'; \
          for file in $$list; do \
-           echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-           install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
+           relfile=`echo "$$file" | sed 's|^.*/||'`; \
+           echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile";\
+           install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$relfile || :;\
          done; \
        else : ; fi
 install-man:

diff --git a/aclocal.m4 b/aclocal.m4
index f30e0eccdc78bff7f4d707391d6773d6ffb32772..e6fa0a2ca3ec18f2d57fe369cdb56b23c1c88283 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -86,8 +86,8 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])

diff --git a/configure b/configure
index c9a7852faa1c7ffc1f37a229cf16b0ce2d77476a..4fa9f822dafd51a550b2443261d4504c964b7450 100755 (executable)
--- a/configure
+++ b/configure
@@ -1473,8 +1473,8 @@ fi
 
 
 # Define the identity of the package.
- PACKAGE=automake
- VERSION=1.7a
+ PACKAGE='automake'
+ VERSION='1.7a'
 
 
 cat >>confdefs.h <<_ACEOF

diff --git a/m4/init.m4 b/m4/init.m4
index 3b74c1cb109f12fec422a570301439b2be17035f..d58a6f472f92028fa1a01ffc50e89dc40533a28c 100644 (file)
--- a/m4/init.m4
+++ b/m4/init.m4
@@ -73,8 +73,8 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
 _AM_IF_OPTION([no-define],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])

diff --git a/stamp-vti b/stamp-vti
index f947d3f9dda6c6868bb2a143844e7cd18fae0f37..ac831d871b4f9d8a9a4f11d28530aa31433d5313 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 4 December 2002
+@set UPDATED 11 December 2002
 @set UPDATED-MONTH December 2002
 @set EDITION 1.7a
 @set VERSION 1.7a

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 0ddbef490e07815d7ff0ef338487fc6aa508507e..9a7d81355709e417140b8dfb8ba0b490cc767c67 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -163,7 +163,6 @@ comment4.test \
 comment5.test \
 comment6.test \
 comment7.test \
-comment8.test \
 compile_f_c_cxx.test \
 cond.test \
 cond2.test \

diff --git a/version.texi b/version.texi
index f947d3f9dda6c6868bb2a143844e7cd18fae0f37..ac831d871b4f9d8a9a4f11d28530aa31433d5313 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 4 December 2002
+@set UPDATED 11 December 2002
 @set UPDATED-MONTH December 2002
 @set EDITION 1.7a
 @set VERSION 1.7a