Index: gnulib-tool
===================================================================
RCS file: /cvsroot/gnulib/gnulib/gnulib-tool,v
retrieving revision 1.15
diff -u -r1.15 gnulib-tool
--- gnulib-tool	17 Aug 2004 23:36:21 -0000	1.15
+++ gnulib-tool	23 Aug 2004 08:24:24 -0000
@@ -37,8 +37,8 @@
 
 AUTOCONF="${AUTOCONFPATH}autoconf"
 AUTOHEADER="${AUTOCONFPATH}autoheader"
-AUTOMAKE="${AUTOCONFPATH}automake-1.7"
-ACLOCAL="aclocal-1.7"
+AUTOMAKE="${AUTOCONFPATH}automake"
+ACLOCAL="${AUTOCONFPATH}aclocal"
 
 # func_usage
 # outputs to stdout the --help usage message.
@@ -511,12 +511,13 @@
   if grep '^BUILT_SOURCES *+=' "$testdir/lib/Makefile.am" > /dev/null; then
     (cd "$testdir"
      ./configure
-       cd lib
-       built_sources=`grep '^BUILT_SOURCES *=' Makefile.in | sed -e 's/^BUILT_SOURCES *=//'`
-       if test -n "$built_sources"; then
-         make $built_sources
-       fi
-       cd ..
+     #cd lib
+     #built_sources=`grep '^BUILT_SOURCES *=' Makefile.in | sed -e 's/^BUILT_SOURCES *=//'`
+     #if test -n "$built_sources"; then
+     #  make $built_sources
+     #fi
+     #cd ..
+     make
      make distclean
     )
   fi