From: Nick Bowler <nbowler@draconx.ca>
Date: Fri, 21 Jun 2013 19:58:49 +0000 (-0400)
Subject: fix-gnulib: Improve filename mangling.
X-Git-Url: https://git.draconx.ca/gitweb/dxcommon.git/commitdiff_plain/566987f66af50062d1de9aaba7695b1ef265754f

fix-gnulib: Improve filename mangling.

This corrects a problem with some of the make rules in the localcharset
module.  Some filenames were not being properly prefixed with lib/ while
others were, leading to some files not being built.
---

diff --git a/scripts/fix-gnulib.pl b/scripts/fix-gnulib.pl
index 2ddf1f8..954780f 100755
--- a/scripts/fix-gnulib.pl
+++ b/scripts/fix-gnulib.pl
@@ -83,8 +83,10 @@ sub mangle_file {
 		# Do nothing.  Generic transformation will take care of
 		# $(srcdir) and $(builddir).
 	} elsif ($word =~ /^[[:word:].+\/-]+$/) {
-		# Fix up things that look like filenames.
-		$word = "lib/$word";
+		# Mangle the filename.  Assume that all relevant files start
+		# with a non-dot (so we don't transform suffix rules) and
+		# contain at least one dot (so we don't transform phony rules).
+		$word = "lib/$word" if ($word =~ /^[^.]+\./);
 	} else {
 		print STDERR "$0:$line: warning: unrecognized source file: $word\n";
 	}
@@ -174,9 +176,6 @@ EOF
 		print ".PHONY: $1-gnulib\n";
 		print "$1-local: $1-gnulib\n";
 		s/$1-generic//;
-
-		# Don't let these targets get confused with filenames below.
-		next;
 	}
 
 	# We need to mangle filenames in make variables; prepending a lib/ on
@@ -216,6 +215,10 @@ EOF
 		drop;
 	}
 
+	# Change t-$@ to $@-t as the former will break if $@ has a directory
+	# component.
+	s/t-\$@/\$\@-t/g;
+
 	# Finally, references to $(srcdir) and $(builddir) need to be fixed up.
 	s:\$\(srcdir\):\$\(top_srcdir\)/lib:g;
 	s:\$\(builddir\):\$\(top_builddir\)/lib:g;