[pkg-wine-party] [SCM] Debian Wine packaging branch, master, updated. wine-1.1.31-1-559-g0a49f78
Ove Kaaven
ovek at arcticnet.no
Tue Nov 3 00:09:33 UTC 2009
The following commit has been merged in the master branch:
commit a6d55d150ea696aa396c27accb081033e6503350
Merge: 116081af1e8e612c0e6e4d566321e6355c8d1485 b82575c48a18000501d098ebabc13d3705f48ceb
Author: Ove Kaaven <ovek at arcticnet.no>
Date: Sat Oct 31 21:30:20 2009 +0100
Merge branch 'deb/paths'
Conflicts:
libs/wine/Makefile.in
diff --combined libs/wine/Makefile.in
index 7d6acc8,74b61ff..09923f7
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@@ -11,7 -11,7 +11,7 @@@ DEFS = -D__WINESRC__ -DWINE_UNICOD
VERSION = 1.0
SOVERSION = 1
-SONAME = libwine.so.$(SOVERSION)
+SONAME = libwine$(LIBSUFFIX).so.$(SOVERSION)
DYNAME = libwine.$(SOVERSION).dylib
INSTALLDIRS = $(DESTDIR)$(libdir)
@@@ -106,26 -106,26 +106,26 @@@ all: $(MODULE) $(MODULE:.dll=.a
# Special defines needed for config.c
CONFIGDIRS = \
- -DBINDIR='"$(libdir)/wine"' \
+ -DBINDIR='"$(dlldir)"' \
-DDLLDIR='"$(dlldir)"' \
- -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(libdir)/wine`\" \
+ -DLIB_TO_BINDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \
-DLIB_TO_DLLDIR=\"`$(RELPATH) $(libdir) $(dlldir)`\" \
- -DBIN_TO_DLLDIR=\"`$(RELPATH) $(libdir)/wine $(dlldir)`\" \
- -DBIN_TO_DATADIR=\"`$(RELPATH) $(libdir)/wine $(datadir)/wine$(DATASUFFIX)`\"
+ -DBIN_TO_DLLDIR=\"`$(RELPATH) $(dlldir) $(dlldir)`\" \
- -DBIN_TO_DATADIR=\"`$(RELPATH) $(dlldir) $(datadir)/wine`\"
++ -DBIN_TO_DATADIR=\"`$(RELPATH) $(dlldir) $(datadir)/wine$(DATASUFFIX)`\"
config.o: config.c $(RELPATH)
$(CC) -c $(ALLCFLAGS) -o $@ $(SRCDIR)/config.c $(CONFIGDIRS)
# Linking rules
-libwine.so.$(VERSION): $(OBJS) $(VERSCRIPT) Makefile.in
+libwine$(LIBSUFFIX).so.$(VERSION): $(OBJS) $(VERSCRIPT) Makefile.in
$(LDSHARED) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@
-libwine.so.$(SOVERSION): libwine.so.$(VERSION)
- $(RM) $@ && $(LN_S) libwine.so.$(VERSION) $@
+libwine$(LIBSUFFIX).so.$(SOVERSION): libwine$(LIBSUFFIX).so.$(VERSION)
+ $(RM) $@ && $(LN_S) libwine$(LIBSUFFIX).so.$(VERSION) $@
-libwine.so: libwine.so.$(SOVERSION)
- $(RM) $@ && $(LN_S) libwine.so.$(SOVERSION) $@
+libwine.so: libwine$(LIBSUFFIX).so.$(SOVERSION)
+ $(RM) $@ && $(LN_S) libwine$(LIBSUFFIX).so.$(SOVERSION) $@
libwine.a: wine.def
$(DLLTOOL) -l $@ -d $(SRCDIR)/wine.def
@@@ -148,9 -148,9 +148,9 @@@ libwine.dylib: libwine.$(SOVERSION).dyl
.PHONY: install-lib-so install-lib-dll install-lib-dylib install-dev-so install-dev-dll install-dev-dylib
-install-lib-so: libwine.so.$(VERSION) $(DESTDIR)$(libdir) dummy
- $(INSTALL_PROGRAM) libwine.so.$(VERSION) $(DESTDIR)$(libdir)/libwine.so.$(VERSION)
- cd $(DESTDIR)$(libdir) && $(RM) libwine.so.$(SOVERSION) && $(LN_S) libwine.so.$(VERSION) libwine.so.$(SOVERSION)
+install-lib-so: libwine$(LIBSUFFIX).so.$(VERSION) $(DESTDIR)$(libdir) dummy
+ $(INSTALL_PROGRAM) libwine$(LIBSUFFIX).so.$(VERSION) $(DESTDIR)$(libdir)/libwine$(LIBSUFFIX).so.$(VERSION)
+ cd $(DESTDIR)$(libdir) && $(RM) libwine$(LIBSUFFIX).so.$(SOVERSION) && $(LN_S) libwine$(LIBSUFFIX).so.$(VERSION) libwine$(LIBSUFFIX).so.$(SOVERSION)
install-lib-dll: libwine.dll $(DESTDIR)$(libdir) dummy
$(INSTALL_DATA) libwine.dll $(DESTDIR)$(libdir)/libwine.dll
@@@ -160,7 -160,7 +160,7 @@@ install-lib-dylib: libwine.$(VERSION).d
cd $(DESTDIR)$(libdir) && $(RM) libwine.$(SOVERSION).dylib && $(LN_S) libwine.$(VERSION).dylib libwine.$(SOVERSION).dylib
install-dev-so: $(DESTDIR)$(libdir) dummy
- cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine.so.$(VERSION) libwine.so
+ cd $(DESTDIR)$(libdir) && $(RM) libwine.so && $(LN_S) libwine$(LIBSUFFIX).so.$(VERSION) libwine.so
install-dev-dll: libwine.a $(DESTDIR)$(libdir) dummy
$(INSTALL_DATA) libwine.a $(DESTDIR)$(libdir)/libwine.a
--
Debian Wine packaging
More information about the pkg-wine-party
mailing list