[pkg-wine-party] [PATCH 5/7] Install wine, wine64 to /usr/bin instead of the respective libdirs

[Hilko Bengen]

This allows us to get rid of most path modifications as far as libwine
is concerned.
---
 debian/libwine.install-common   |    1 -
 debian/libwine.install-platform |    3 +++
 debian/rules                    |    4 ----
 libs/wine/Makefile.in           |    8 ++++----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/libwine.install-common b/debian/libwine.install-common
index 16a7adb..54b32f3 100644
--- a/debian/libwine.install-common
+++ b/debian/libwine.install-common
@@ -1,4 +1,3 @@
 debian/tmp/usr/lib/libwine*.so.*
-debian/tmp/usr/lib/wine/wine.bin
 debian/tmp/usr/share/wine/generic.ppd
 debian/tmp/usr/share/wine/fonts
diff --git a/debian/libwine.install-platform b/debian/libwine.install-platform
index 7f7eeb6..a201d22 100644
--- a/debian/libwine.install-platform
+++ b/debian/libwine.install-platform
@@ -1,3 +1,6 @@
 debian/tmp/usr/lib/wine/wine-kthread
 debian/tmp/usr/lib/wine/wine-pthread
 debian/tmp/usr/lib/wine/wine-preloader
+
+debian/tmp/usr/bin/wine
+debian/tmp/usr/bin/wine64
diff --git a/debian/rules b/debian/rules
index 9deeca9..990d076 100755
--- a/debian/rules
+++ b/debian/rules
@@ -243,8 +243,6 @@ install-arch32-stamp: build-arch32-stamp
 
 	# install wine, libwine, fonts, and tools
 	$(MAKE) -C build32 install $(IA32_OVERRIDES) DESTDIR=$(CURDIR)/debian/tmp
-	# move the real binaries into /$(IA32_WINEDIR)
-	mv debian/tmp/usr/bin/wine debian/tmp/$(IA32_WINEDIR)/wine.bin
 	for ldr in $(LOADERS); do \
 	 [ ! -f debian/tmp/usr/bin/$$ldr ] || \
 	 mv debian/tmp/usr/bin/$$ldr debian/tmp/$(IA32_WINEDIR); \
@@ -271,8 +269,6 @@ install-arch64-stamp: build-arch64-stamp $(patsubst build%,install-arch%-stamp,$
 
 	# install wine, libwine, fonts, and tools
 	$(MAKE) -C build64 install $(AMD64_OVERRIDES) DESTDIR=$(CURDIR)/debian/tmp
-	# move the real binaries into /$(AMD64_WINEDIR)
-	mv debian/tmp/usr/bin/wine64 debian/tmp/$(AMD64_WINEDIR)/wine.bin
 	# install manpages
 	$(MAKE) -C build64/documentation install-man DESTDIR=$(CURDIR)/debian/tmp
 	mv debian/tmp/usr/share/man/man3w debian/tmp/usr/share/man/man3
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 977a1b6..822e6b7 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -101,12 +101,12 @@ all: $(MODULE) $(MODULE:.dll=.a)
 # Special defines needed for config.c
 
 CONFIGDIRS = \
-	-DBINDIR='"$(dlldir)"' \
+	-DBINDIR='"$(bindir)"' \
 	-DDLLDIR='"$(dlldir)"' \
-	-DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \
+	-DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(bindir)`\" \
 	-DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \
-	-DBIN_TO_DLLDIR=\"`$(RELPATH) $(dlldir) $(dlldir)`\" \
-	-DBIN_TO_DATADIR=\"`$(RELPATH) $(dlldir) $(datadir)/wine$(DATASUFFIX)`\"
+	-DBIN_TO_DLLDIR=\"`$(RELPATH) $(bindir) $(dlldir)`\" \
+	-DBIN_TO_DATADIR=\"`$(RELPATH) $(bindir) $(datadir)/wine$(DATASUFFIX)`\"
 
 config.o: config.c $(RELPATH)
 	$(CC) -c $(ALLCFLAGS) -o $@ $(srcdir)/config.c $(CONFIGDIRS)
-- 
1.7.10