[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.23-2-1-ge3e8e47

Ove Kaaven ovek at arcticnet.no
Fri Jun 19 22:42:33 UTC 2009


The following commit has been merged in the master branch:
commit e3e8e474f5cc2b2f849276b3f83cd402a798984d
Author: Ove Kaaven <ovek at arcticnet.no>
Date:   Fri Jun 19 23:36:27 2009 +0200

    Check at build time whether /usr/lib32 is a symlink (and what it symlinks to).
    It should then be a matter of a quick rebuild in the appropriate build environment
    to get packages that work both before and after the transition.

diff --git a/debian/rules b/debian/rules
index 3481586..8828bc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,9 +46,13 @@ AMD64_LIBDIR := $(LIBDIR)
 
 ifeq ($(DEB_HOST_GNU_CPU),x86_64)
 
-IA32_LIBS = /emul/ia32-linux
+IA32_LIBS := /emul/ia32-linux
 IA32_LDFLAGS += -L$(CURDIR)/lib32
-IA32_LIBDIR = emul/ia32-linux/usr/lib
+IA32_LIBDIR := usr/lib32
+IA32_LIBDIR_LINK := $(shell readlink /$(IA32_LIBDIR))
+ifneq (,$(IA32_LIBDIR_LINK))
+IA32_LIBDIR := $(patsubst /%,%,$(IA32_LIBDIR_LINK))
+endif
 
 # Not ready yet: build Win64 version
 #BUILDS = build32 build64

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list