The recent flurry of --makefile-name patches broke coreutils bootstrap
(which hasn't yet been converted to use --makefile-name) as follows:
./bootstrap: automake --add-missing --copy --force-missing ...
lib/gnulib.mk:22: EXTRA_DIST must be set with `=' before using `+='
lib/Makefile.am:20: `lib/gnulib.mk' included from here
lib/gnulib.mk:34: BUILT_SOURCES must be set with `=' before using `+='
lib/Makefile.am:20: `lib/gnulib.mk' included from here
lib/gnulib.mk:70: MOSTLYCLEANDIRS must be set with `=' before using `+='
lib/Makefile.am:20: `lib/gnulib.mk' included from here
lib/gnulib.mk:179: CLEANFILES must be set with `=' before using `+='
lib/Makefile.am:20: `lib/gnulib.mk' included from here
lib/gnulib.mk:348: MAINTAINERCLEANFILES must be set with `=' before using
`+='
lib/Makefile.am:20: `lib/gnulib.mk' included from here
lib/gnulib.mk:564: SUFFIXES must be set with `=' before using `+='
lib/Makefile.am:20: `lib/gnulib.mk' included from here
I installed the following patch, which looks obvious to me, but
perhaps I'm missing something.
2006-09-01 Paul Eggert <[EMAIL PROTECTED]>
* gnulib-tool (func_emit_lib_Makefile_am): Fix typos in
yesterday's patch by changing test -n to test -z.
--- gnulib-tool.~1.155.~ 2006-09-01 07:35:54.000000000 -0700
+++ gnulib-tool 2006-09-01 08:11:00.000000000 -0700
@@ -1053,7 +1053,7 @@ func_emit_lib_Makefile_am ()
echo "# Reproduce by: $actioncmd"
fi
echo
- if test -n "$makefile_name"; then
+ if test -z "$makefile_name"; then
# No need to generate dependencies since the sources are in gnulib, not
here.
echo "AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies"
fi
@@ -1096,7 +1096,7 @@ func_emit_lib_Makefile_am ()
echo
echo "${libname}_${libext}_SOURCES ="
echo "${libname}_${libext}_LIBADD = @${perhapsLT}LIBOBJS@"
- if test -n "$makefile_name"; then
+ if test -z "$makefile_name"; then
echo "noinst_HEADERS ="
if grep '^pkgdata_DATA *+=' allsnippets.tmp > /dev/null; then
echo "pkgdata_DATA ="
@@ -1106,7 +1106,7 @@ func_emit_lib_Makefile_am ()
echo "SUFFIXES ="
fi
echo "MOSTLYCLEANFILES $assign core *.stackdump"
- if test -n "$makefile_name"; then
+ if test -z "$makefile_name"; then
echo "MOSTLYCLEANDIRS ="
echo "CLEANFILES ="
echo "DISTCLEANFILES ="
