Francois Gouget wrote:
[...]
> Changelog:
>
> Francois Gouget <fgouget@codeweavers.com>
>
> * tools/winemaker
>
> wineapploader changes:
> - Use WINE as determined by configure.ac
> - make the toplevel wineapploader executable
> - symlink to it rather than copying
> - One must load 'xxx.exe.so' otherwise wine fails to load the Winelib
> application
> - Setting WINEDLLPATH does not seem necessary
Argh. Wrong patch, use this one instead.
--
Francois Gouget
fgouget@codeweavers.com
Index: tools/winemaker
===================================================================
RCS file: /home/wine/wine/tools/winemaker,v
retrieving revision 1.54
diff -u -r1.54 winemaker
--- tools/winemaker 26 Sep 2002 03:20:59 -0000 1.54
+++ tools/winemaker 26 Sep 2002 21:26:32 -0000
@@ -1852,9 +1853,8 @@
print FILEO "\n\n";
if (@$project[$P_PATH] eq "") {
print FILEO "wineapploader: wineapploader.in\n";
- print FILEO "\tsed -e 's,\@bindir\\\@,\$(bindir),g' " .
- "-e 's,\@winelibdir\\\@,.,g' " .
- "\$(SRCDIR)/wineapploader.in >\$\@ || \$(RM) \$\@\n";
+ print FILEO "\tsed -e 's,\@WINE\@,\$(WINE),g' " .
+ "\$(SRCDIR)/wineapploader.in >\$\@ && chmod u+x \$\@ || \$(RM) \$\@\n";
print FILEO "\n";
}
print FILEO "\@MAKE_RULES\@\n";
@@ -1931,7 +1929,9 @@
}
print FILEO " \$(LDDLLFLAGS) -o \$\@ \$(${canon}_OBJS) @$target[$T_NAME].spec.o \$(${canon}_LIBRARY_PATH) \$(ALL_LIBRARY_PATH) $all_libs \$(LIBS)\n";
if (@$target[$T_TYPE] ne $TT_DLL) {
- print FILEO "\ttest -f @$target[$T_NAME] || \$(INSTALL_SCRIPT) wineapploader @$target[$T_NAME]\n";
+ my $basename=@$target[$T_NAME];
+ $basename=~ s/\.exe$//;
+ print FILEO "\ttest -f @$target[$T_NAME] || \$(LN_S) \$(TOPOBJDIR)/wineapploader $basename\n";
}
print FILEO "\n\n";
}
@@ -3155,16 +3170,14 @@
# Copyright (C) 2002 Alexandre Julliard
# determine the app Winelib library name
-appname=`basename "$0" .exe`.exe
-
-#allow Wine to load Winelib application from the current directory
-export WINEDLLPATH=$WINEDLLPATH:@winelibdir@
+appname=`basename "$0"`.so
# first try explicit WINELOADER
if [ -x "$WINELOADER" ]; then exec "$WINELOADER" "$appname" "$@"; fi
# then default bin directory
-if [ -x "@bindir@/wine" ]; then exec "@bindir@/wine" "$appname" "$@"; fi
+WINE="@WINE@"
+if [ -x "$WINE" ]; then exec "$WINE" "$appname" "$@"; fi
# now try the directory containing $0
appdir=""
