* configure.in, NEWS: Bump version to 1.6d.

* tests/libobj12.test, tests/libobj12b.test: Include ./defs,
not $srcdir/defs.
* tests/suffix8.test: Typo.

diff --git a/ChangeLog b/ChangeLog
index 38b165ae56a11954b1f7e56e6fd163ba52c5d7d3..4e99a39f4ffbc8c0d0461818b1b28285ed6d109f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-09-18  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
+       * configure.in, NEWS: Bump version to 1.6d.
+       * tests/libobj12.test, tests/libobj12b.test: Include ./defs,
+       not $srcdir/defs.
+       * tests/suffix8.test: Typo.
+
        * automake.in (check_ambiguous_conditional, rule_define): Issue
        syntactic warnings, not errors.
        (macro_define): Don't adjust the owner of a variable which is being

diff --git a/Makefile.in b/Makefile.in
index 01ced99beb4eb127ce42ef64dda78bbe7886cf50..9bd86c43c99208d32fabbf0a82acc7238cd22325 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6c from Makefile.am.
+# Makefile.in generated by automake 1.6d from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/NEWS b/NEWS
index fce120c2919e6683e2b0a19e88daff2f08d9efe6..22ee91d89356a78dba166081ffe33d818858cbb3 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-New in 1.6c:
+New in 1.6d:
 * Autoconf 2.54 is required.
 * `aclocal' and `automake' will no longer warn about obsolete
   configure macros.  This is done by `autoconf -Wobsolete'.

diff --git a/aclocal.m4 b/aclocal.m4
index 77bbe9fc2a1948c3195814a4f83b04447680e5a6..5970a78c5c7ef78ea3a8a5a8d49f8bf53890e66e 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.6c -*- Autoconf -*-
+# generated automatically by aclocal 1.6d -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -153,14 +153,14 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6c"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6d"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-        [AM_AUTOMAKE_VERSION([1.6c])])
+        [AM_AUTOMAKE_VERSION([1.6d])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 

diff --git a/configure b/configure
index c9d8c251eaac1698715084001a500120d6d043b7..27e1f294354423e2fce9b80a5eca9dd17f0d6d01 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.54 for GNU Automake 1.6c.
+# Generated by GNU Autoconf 2.54 for GNU Automake 1.6d.
 #
 # Report bugs to <bug-automake@gnu.org>.
 #
@@ -265,8 +265,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GNU Automake'
 PACKAGE_TARNAME='automake'
-PACKAGE_VERSION='1.6c'
-PACKAGE_STRING='GNU Automake 1.6c'
+PACKAGE_VERSION='1.6d'
+PACKAGE_STRING='GNU Automake 1.6d'
 PACKAGE_BUGREPORT='bug-automake@gnu.org'
 
 ac_unique_file="automake.in"
@@ -719,7 +719,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GNU Automake 1.6c to adapt to many kinds of systems.
+\`configure' configures GNU Automake 1.6d to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -781,7 +781,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GNU Automake 1.6c:";;
+     short | recursive ) echo "Configuration of GNU Automake 1.6d:";;
    esac
   cat <<\_ACEOF
 
@@ -848,7 +848,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GNU Automake configure 1.6c
+GNU Automake configure 1.6d
 generated by GNU Autoconf 2.54
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -863,7 +863,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GNU Automake $as_me 1.6c, which was
+It was created by GNU Automake $as_me 1.6d, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   $ $0 $@
@@ -1197,7 +1197,7 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub"
 ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 
 
-am__api_version="1.6c"
+am__api_version="1.6d"
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -1436,7 +1436,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=automake
- VERSION=1.6c
+ VERSION=1.6d
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2093,7 +2093,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GNU Automake $as_me 1.6c, which was
+This file was extended by GNU Automake $as_me 1.6d, which was
 generated by GNU Autoconf 2.54.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2147,7 +2147,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GNU Automake config.status 1.6c
+GNU Automake config.status 1.6d
 configured by $0, generated by GNU Autoconf 2.54,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index 420ff24a6753e39b3931f6a9a0f8ed81fdf28878..aae7c4037517caef95285d9509bbb447271a59ea 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,7 +19,7 @@
 # 02111-1307, USA.
 
 AC_PREREQ(2.54)
-AC_INIT([GNU Automake], [1.6c], [bug-automake@gnu.org])
+AC_INIT([GNU Automake], [1.6d], [bug-automake@gnu.org])
 
 AC_CONFIG_SRCDIR(automake.in)
 AC_CONFIG_AUX_DIR(lib)

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 9472751b3adca04be566c5e7bfd962ea789649cf..3fced07a695c02fd6175b57f6aa2c5c71afc5651 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6c from Makefile.am.
+# Makefile.in generated by automake 1.6d from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/lib/Makefile.in b/lib/Makefile.in
index 1aac595f67e151903f4bbc3084a353cbe6906b54..318a44df9477ea8a9a381ba5e572c9db9580cd50 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6c from Makefile.am.
+# Makefile.in generated by automake 1.6d from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 393e66971bfbf5e2ba3de9166a8c098481408def..c94df3eaa1ce2aac92cc2425e9a15f3c2e9a5c45 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6c from Makefile.am.
+# Makefile.in generated by automake 1.6d from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 8ed7004d4da1ccdfa12fc52a960e81df867f7696..967f4816fa803d5eddb638f1de81c353383f372c 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6c from Makefile.am.
+# Makefile.in generated by automake 1.6d from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/stamp-vti b/stamp-vti
index cc15f3848dc9050a8a8d397990c4848fb05cec9c..0428371ba34be5453be77ca4205a6d4277785a8c 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
 @set UPDATED 17 September 2002
 @set UPDATED-MONTH September 2002
-@set EDITION 1.6c
-@set VERSION 1.6c
+@set EDITION 1.6d
+@set VERSION 1.6d

diff --git a/tests/Makefile.in b/tests/Makefile.in
index 5125e601335cb7b9de7555a90ecb03b6d6cf0c6e..c025ca5535b80fa5780d0ef131fac90385e5f6a1 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.6c from Makefile.am.
+# Makefile.in generated by automake 1.6d from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002

diff --git a/tests/libobj12.test b/tests/libobj12.test
index ef47c883a1cbc6ee4cac7d20783d55d711f855ec..a3907263d9f17d5cf68a47735790beeff9ecf579 100755 (executable)
--- a/tests/libobj12.test
+++ b/tests/libobj12.test
@@ -22,7 +22,7 @@
 # Test if a file can be mentioned in LIBOBJS and explicitly.
 # (See libobj12b.test for the LTLIBRARIES check.)
 
-. $srcdir/defs || exit 1
+. ./defs || exit 1
 set -e
 
 cat >> configure.in << 'END'

diff --git a/tests/libobj12b.test b/tests/libobj12b.test
index 2b6970228857a944c1d2ced7ada6072209b84f85..ecfb0822a74553b465362cd87da92836209ea14e 100755 (executable)
--- a/tests/libobj12b.test
+++ b/tests/libobj12b.test
@@ -23,7 +23,7 @@
 # (Like libobj12.test, but for Libtool libraries.)
 
 required='libtoolize'
-. $srcdir/defs || exit 1
+. ./defs || exit 1
 set -e
 
 cat >> configure.in << 'END'

diff --git a/tests/suffix8.test b/tests/suffix8.test
index d98a8bba1a0d8a74282fa5b00d373adffb01874a..6b1919ce1cba0e5f88ef3e34d529674d9f90f3d4 100755 (executable)
--- a/tests/suffix8.test
+++ b/tests/suffix8.test
@@ -50,7 +50,7 @@ libfoo_la_SOURCES = bar.x_
 .z_.lo:
        cp $< $@
 
-# Add explicit dependencies to halp make implementations that
+# Add explicit dependencies to help make implementations that
 # don't otherwise chain implicit rules (e.g., Sun make).
 foo.$(OBJEXT): foo.y_
 bar.lo: bar.z_

diff --git a/version.texi b/version.texi
index cc15f3848dc9050a8a8d397990c4848fb05cec9c..0428371ba34be5453be77ca4205a6d4277785a8c 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
 @set UPDATED 17 September 2002
 @set UPDATED-MONTH September 2002
-@set EDITION 1.6c
-@set VERSION 1.6c
+@set EDITION 1.6d
+@set VERSION 1.6d