Patch: winemaker-regressions.diff
Martin Wilck <Martin.Wilck@fujitsu-siemens.com>
Patch against: CVS 2002-09-11
Modified files:
- tools: winemaker
Fix regressions in winemaker 1.49
* fix perl syntax error in generate_wrapper_file()
* fix autoconf invocation to support both 2.5x and 2.13
* target_init(\$global_settings) must not be done after reading command line
Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.49
diff -u -r1.49 winemaker
--- tools/winemaker 11 Sep 2002 01:09:58 -0000 1.49
+++ tools/winemaker 11 Sep 2002 11:54:52 -0000
@@ -1670,6 +1670,7 @@
{
my $path=$_[0];
my $target=$_[1];
+ my $app_name=@$target[$T_NAME];
return generate_from_template("wrapper.c","$path${app_name}_wrapper.c",[
["APP_NAME",@$target[$T_NAME]],
@@ -2069,7 +2070,7 @@
["PROJECTS",join("\n",map { "@$_[$P_PATH]Makefile" } @projects)],
["SOURCE","$a_source_file"],
["NEEDS_MFC","$needs_mfc"]]);
- system("autoconf");
+ system("autoconf configure.ac > configure");
# Add execute permission to configure for whoever has the right to read it
my @st=stat("configure");
@@ -2182,6 +2183,8 @@
exit (2);
}
+target_init(\@global_settings);
+
while (@ARGV>0) {
my $arg=shift @ARGV;
# General options
@@ -2284,7 +2287,6 @@
}
project_init(\@main_project,"");
-target_init(\@global_settings);
# Fix the file and directory names
fix_file_and_directory_names(".");
--
Martin Wilck Phone: +49 5251 8 15113
Fujitsu Siemens Computers Fax: +49 5251 8 20409
Heinz-Nixdorf-Ring 1 mailto:Martin.Wilck@Fujitsu-Siemens.com
D-33106 Paderborn http://www.fujitsu-siemens.com/primergy
