[pkg-wine-party] [wine] 02/03: Install winegcc script again to specify WINEBUILD.

[Jens Reyer]

This is an automated email from the git hooks/post-receive script.

jreyer-guest pushed a commit to branch master
in repository wine.

commit d03be86d8c1c9898acea1d1cfdef4c041208385a
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Fri Mar 4 02:39:45 2016 +0100

    Install winegcc script again to specify WINEBUILD.
    
    wineg++ doesn't find winebuild, unless it is in the system path,
    or specified in WINEBUILD. But it's not found automatically in
    Wine's bindir, reported at
    https://bugs.winehq.org/show_bug.cgi?id=40245
    
    Based on the winegcc script introduced after #753926.
---
 debian/rules                       | 1 +
 debian/scripts/winegcc             | 7 +++++++
 debian/wine32VERSION-tools.install | 2 ++
 debian/wine32VERSION-tools.links   | 1 -
 debian/wine64VERSION-tools.install | 2 ++
 debian/wine64VERSION-tools.links   | 1 -
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 236443e..c607d97 100755
--- a/debian/rules
+++ b/debian/rules
@@ -128,6 +128,7 @@ override_dh_auto_install-arch: $(INSTALLS)
 	cp ANNOUNCE debian/tmp/changelog
 	cp tools/winedump/README debian/tmp/README.winedump
 	cp server/wineserver debian/tmp/wineserver$(DEB_BUILD_ARCH_BITS)
+	sed "s|BINDIR|$(BINDIR)|g" debian/scripts/winegcc > debian/tmp/winegcc$(VERSION)
 	dh_auto_install
 	for file in $$(find . ! -path "./debian/*" -name \*.man); do \
 	    rename=$$(basename $$file | sed "s/\\./$(VERSION)./;s/UTF-8\\.//"); \
diff --git a/debian/scripts/winegcc b/debian/scripts/winegcc
new file mode 100644
index 0000000..9479d50
--- /dev/null
+++ b/debian/scripts/winegcc
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+if test -z "$WINEBUILD"; then
+    export WINEBUILD="/BINDIR/winebuild"
+fi
+
+exec /BINDIR/winegcc $@
diff --git a/debian/wine32VERSION-tools.install b/debian/wine32VERSION-tools.install
index 3d5db4f..cfe7ccc 100644
--- a/debian/wine32VERSION-tools.install
+++ b/debian/wine32VERSION-tools.install
@@ -6,3 +6,5 @@ usr/lib/wineVERSION/wineg++
 usr/lib/wineVERSION/winedump
 usr/lib/wineVERSION/winebuild
 usr/lib/wineVERSION/winemaker
+
+debian/tmp/winegccVERSION usr/bin
diff --git a/debian/wine32VERSION-tools.links b/debian/wine32VERSION-tools.links
deleted file mode 100644
index 6d788e6..0000000
--- a/debian/wine32VERSION-tools.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/wineVERSION/winegcc usr/bin/winegccVERSION
diff --git a/debian/wine64VERSION-tools.install b/debian/wine64VERSION-tools.install
index 3d5db4f..cfe7ccc 100644
--- a/debian/wine64VERSION-tools.install
+++ b/debian/wine64VERSION-tools.install
@@ -6,3 +6,5 @@ usr/lib/wineVERSION/wineg++
 usr/lib/wineVERSION/winedump
 usr/lib/wineVERSION/winebuild
 usr/lib/wineVERSION/winemaker
+
+debian/tmp/winegccVERSION usr/bin
diff --git a/debian/wine64VERSION-tools.links b/debian/wine64VERSION-tools.links
deleted file mode 100644
index 6d788e6..0000000
--- a/debian/wine64VERSION-tools.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/wineVERSION/winegcc usr/bin/winegccVERSION

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git