wineprefixcreate: Make wineprefixcreate path searching relative
Pierre d'Herbemont
stegefin at free.fr
Sat Mar 11 14:12:11 CST 2006
Alexandre,
With this patch wineprefixcreate does not relay anymore on absolute
installation path, so that installation prefix can be changed after
the build process. (And thus allow Wine to be packaged as a single
application in Mac OS X).
Thanks,
Pierre.
ChangeLog:
Make wineprefixcreate path searching relative.
tools/Makefile.in | 4 ++--
tools/wineprefixcreate.in | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
bb4b7dd86cf9cc5c43640ec27752c27754c71cd6
diff --git a/tools/Makefile.in b/tools/Makefile.in
index c44525d..651dbe2 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -69,8 +69,8 @@ sfnt2fnt$(EXEEXT): sfnt2fnt.o
bin2res$(EXEEXT): bin2res.o
$(CC) $(CFLAGS) -o $@ bin2res.o $(LIBPORT)
-wineprefixcreate: wineprefixcreate.in
- sed -e 's, at dlldir\@,$(dlldir),g' -e 's, at datadir\@,$(datadir),g' $
(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false)
+wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT)
+ sed -e s, at bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g -e
s, at bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)`,g $(SRCDIR)/
wineprefixcreate.in >$@ || ($(RM) $@ && false)
chmod +x wineprefixcreate
install install-lib:: wineprefixcreate
diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in
index 876a533..9fc97d2 100644
--- a/tools/wineprefixcreate.in
+++ b/tools/wineprefixcreate.in
@@ -36,8 +36,9 @@ usage()
set -e
-dlldir="@dlldir@"
-datadir="@datadir@/wine"
+bindir=`cd \`dirname $0\` && pwd`
+dlldir="$bindir/@bintodlldir@"
+datadir="$bindir/@bintodatadir@"
do_wait=0
quiet=0
More information about the wine-patches
mailing list