regen

diff --git a/aclocal.m4 b/aclocal.m4
index 10ec331..444454a 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -131,7 +131,16 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
 # loop where config.status creates the headers, so we can generate
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
+[# Compute $1's index in $config_headers.
+_am_stamp_count=1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+  esac
+done
 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 
 # Copyright 2002  Free Software Foundation, Inc.

diff --git a/lib/Automake/tests/Makefile.in b/lib/Automake/tests/Makefile.in
index 812017c..6d8ffe1 100644 (file)
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@ -72,6 +72,7 @@ STRIP = @STRIP@
 TEX = @TEX@
 VERSION = @VERSION@
 ac_ct_STRIP = @ac_ct_STRIP@
+am__leading_dot = @am__leading_dot@
 bindir = @bindir@
 build_alias = @build_alias@
 datadir = @datadir@
@@ -195,9 +196,6 @@ check-TESTS: $(TESTS)
        else :; fi
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-top_distdir = ../../..
-distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-
 distdir: $(DISTFILES)
        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \