X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/ff3807b3c1ad23f6a8811241665a00a0c9e957f4..7e65772a8de842e9bea15144bd1b8bc48b9240a3:/scripts/fix-gnulib.pl

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index d4ea7d1..8b61163 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -138,6 +138,10 @@ gnulib_orderonly = $(gnulib_have_orderonly:order-only=|)
 gnulib_core_headers =
 gnulib_raw_headers = $(gnulib_core_headers)
 gnulib_headers = $(gnulib_orderonly) $(gnulib_raw_headers)
+
+# Oddly, gnulib tries to add to MOSTLYCLEANDIRS (which is *not* an automake
+# variable) without defining it.
+MOSTLYCLEANDIRS =
 EOF
 
 		$printed_header = 1;
@@ -203,7 +207,7 @@ EOF
 	# may not actually delete everything if the configuration changes
 	# after building the package.  Stash all the variables for later so
 	# they can be moved outside of any conditional.
-	if (/CLEANFILES/) {
+	if (/(CLEANFILES|CLEANDIRS)[[:space:]]*\+=/) {
 		push(@cleanfiles, $_);
 		drop;
 	}