[PATCH] generate stand alone AC_CONFIG_FILES() lines.

Marcus Meissner marcus at jet.franken.de
Tue Feb 27 00:48:58 CST 2007


Hi,

Another try to generate stand alone AC_CONFIG_FILES lines
to make git merges easier.

Ciao, Marcus
---
 tools/make_makefiles |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/make_makefiles b/tools/make_makefiles
index b21d4ef..7931e36 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -229,10 +229,14 @@ foreach my $var (sort { $makerules{$a} c
     push @lines, "AC_SUBST_FILE($var)\n\n";
 }
 
-replace_in_file( "configure.ac", '^MAKE_RULES', '\]\)$',
-                 @lines,
-                 "AC_CONFIG_FILES([\n",
-                 join ("\n", (sort values %makerules), (sort @makefiles) ), "])\n" );
+foreach my $var ((sort values %makerules), (sort @makefiles))
+{
+    push @lines, "AC_CONFIG_FILES([$var])\n";
+}
+# AC_OUTPUT marks the end, but reemit since it got deleted.
+push @lines,"\n","AC_OUTPUT\n";
+
+replace_in_file( "configure.ac", '^MAKE_RULES', '^AC_OUTPUT$', @lines);
 
 
 ################################################################
-- 
1.4.3.4



More information about the wine-patches mailing list