wine.inf: Add a version number to make sure the file changes between versions.
diff --git a/.gitignore b/.gitignore
index e3feaa1..7aeef02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -712,6 +712,7 @@
tools/widl/parser.yy.c
tools/widl/widl
tools/widl/widl.man
+tools/wine.inf
tools/winebuild/winebuild
tools/winebuild/winebuild.man
tools/winedump/winedump
diff --git a/tools/Makefile.in b/tools/Makefile.in
index d771c51..c7a3ebf 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -14,6 +14,7 @@
makedep$(EXEEXT) \
relpath$(EXEEXT) \
sfnt2fnt$(EXEEXT) \
+ wine.inf \
wineprefixcreate
MANPAGES = \
@@ -70,13 +71,16 @@
sfnt2fnt$(EXEEXT): sfnt2fnt.o relpath$(EXEEXT)
$(CC) $(CFLAGS) -o $@ sfnt2fnt.o $(LIBWINE) $(LIBPORT) $(LDFLAGS) $(FREETYPELIBS) $(LDRPATH_LOCAL)
+wine.inf: wine.inf.in
+ LC_ALL=C sed -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' $(SRCDIR)/wine.inf.in >$@ || ($(RM) $@ && false)
+
wineprefixcreate: wineprefixcreate.in relpath$(EXEEXT)
sed -e "s,@bintodlldir\@,`$(RELPATH) $(bindir) $(dlldir)`,g" -e "s,@bintodatadir\@,`$(RELPATH) $(bindir) $(datadir)/wine`,g" $(SRCDIR)/wineprefixcreate.in >$@ || ($(RM) $@ && false)
chmod +x wineprefixcreate
-install install-lib:: wineprefixcreate $(INSTALLDIRS)
+install install-lib:: wine.inf wineprefixcreate $(INSTALLDIRS)
$(INSTALL_SCRIPT) wineprefixcreate $(DESTDIR)$(bindir)/wineprefixcreate
- $(INSTALL_DATA) $(SRCDIR)/wine.inf $(DESTDIR)$(datadir)/wine/wine.inf
+ $(INSTALL_DATA) wine.inf $(DESTDIR)$(datadir)/wine/wine.inf
$(INSTALL_DATA) $(SRCDIR)/wine.desktop $(DESTDIR)$(datadir)/applications/wine.desktop
$(INSTALL_DATA) wineprefixcreate.man $(DESTDIR)$(mandir)/man$(prog_manext)/wineprefixcreate.$(prog_manext)
-$(UPDATE_DESKTOP_DATABASE)
diff --git a/tools/wine.inf b/tools/wine.inf.in
similarity index 99%
rename from tools/wine.inf
rename to tools/wine.inf.in
index f3cda7b..9f120b9 100644
--- a/tools/wine.inf
+++ b/tools/wine.inf.in
@@ -1,4 +1,5 @@
;; .INF script for the basic Wine configuration
+;; Version: @PACKAGE_STRING@
;;
;; This should be run through setupapi:
;; rundll32 setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
diff --git a/tools/wineprefixcreate.in b/tools/wineprefixcreate.in
index d91a3f6..af8a5f9 100644
--- a/tools/wineprefixcreate.in
+++ b/tools/wineprefixcreate.in
@@ -79,21 +79,7 @@
LD_LIBRARY_PATH="$topdir/libs/wine"
fi
export LD_LIBRARY_PATH
-
- # find the source directory
- link=`readlink "$WINELOADER"`
- if [ -z "$link" ]
- then
- topsrcdir="$topdir"
- else
- link=`dirname "$link"`
- case "$link" in
- /*) topsrcdir=`cd "$link/.." && pwd` ;;
- *) topsrcdir=`cd "$topdir/$link/.." && pwd` ;;
- esac
- fi
- dlldir="$topdir/programs"
- datadir="$topsrcdir/tools"
+ datadir="$topdir/tools"
fi
while [ $# -gt 0 ]
