Patch: wineapploader.diff
Martin Wilck <Martin.Wilck@fujitsu-siemens.com>
Modified files:
tools: winemaker
- wineapploader: if --with-wine is used, wineapploader
still prefers /usr/local/bin/wine - use $(WINE) from Makefile instead.
- call $0.exe.so rather than $0.exe (fixes some file naming issues
with capital letters in file names, probably the better solution than
that in my patch http://www.winehq.com/hypermail/wine-devel/2002/09/0080.html).
This patch is incremental over Francois Gouget's latest winemaker patch:
http://www.winehq.com/hypermail/wine-patches/2002/09/0028.html
and my previous patches (winemaker-bugs.diff, winemaker-options.diff)
--- CVS/wine/tools/winemaker Fri Sep 6 17:37:21 2002
+++ TMP/wine/tools/winemaker Fri Sep 6 17:37:28 2002
@@ -1918,15 +1918,15 @@
print FILEO " \$(DLLS) \$(EXES:%=%.so)";
}
print FILEO "\n\n";
+ print FILEO "\@MAKE_RULES\@\n";
+ print FILEO "\n";
if (@$project[$P_PATH] eq "") {
- print FILEO "wineapploader: wineapploader.in\n";
- print FILEO "\tsed -e 's,\@bindir\\\@,\$(bindir),g' " .
+ print FILEO "wineapploader: \$(SRCDIR)/wineapploader.in\n";
+ print FILEO "\tsed -e 's,\@bindir\\\@/wine,\$(WINE),g' " .
"-e 's,\@winelibdir\\\@,.,g' " .
"\$(SRCDIR)/wineapploader.in >\$\@ || \$(RM) \$\@\n";
print FILEO "\n";
}
- print FILEO "\@MAKE_RULES\@\n";
- print FILEO "\n";
print FILEO "install::\n";
if (@$project[$P_PATH] eq "") {
# This is the main project. It is also responsible for recursively
@@ -3136,7 +3136,7 @@
# Copyright (C) 2002 Alexandre Julliard
# determine the app Winelib library name
-appname=`basename "$0" .exe`.exe
+appname=`basename "$0" .exe`.exe.so
#allow Wine to load Winelib application from the current directory
export WINEDLLPATH=$WINEDLLPATH:@winelibdir@
--
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
