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

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 85ae632..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;
@@ -193,12 +197,17 @@ EOF
 		$_ = mangle_target($_);
 	}
 
+	# MKDIR_P commands need to be fixed up; in principle Gnulib could also
+	# be patched here to use $(@D) instead (and thus automatically benefit
+	# from the target being fixed up), but this will do for now.
+	s/^(\t.*\$\(MKDIR_P\)) ([[:alnum:]]+)$/\1 lib\/\2/;
+
 	# When using conditional-dependencies, *CLEANFILES can end up
 	# depending on the configuration.  This means that "make distclean"
 	# 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;
 	}