Patched Makefile for multilib support.

3 files changed, 53 insertions, 9 deletions

diff --git a/media-libs/libjackasyn/ChangeLog b/media-libs/libjackasyn/ChangeLog
index ed1f205d2ecd..58c4b95c6bfd 100644
--- a/media-libs/libjackasyn/ChangeLog
+++ b/media-libs/libjackasyn/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libjackasyn
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjackasyn/ChangeLog,v 1.8 2004/09/01 17:11:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjackasyn/ChangeLog,v 1.9 2004/10/07 07:04:44 eradicator Exp $
+
+  07 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libjackasyn-0.10-destdir.patch:
+  Patched Makefile for multilib support.
 
   01 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   libjackasyn-0.10.ebuild:
diff --git a/media-libs/libjackasyn/files/libjackasyn-0.10-destdir.patch b/media-libs/libjackasyn/files/libjackasyn-0.10-destdir.patch
new file mode 100644
index 000000000000..443766f08ad2
--- /dev/null
+++ b/media-libs/libjackasyn/files/libjackasyn-0.10-destdir.patch
@@ -0,0 +1,32 @@
+diff -Naur libjackasyn-0.10.orig/Makefile.in libjackasyn-0.10/Makefile.in
+--- libjackasyn-0.10.orig/Makefile.in	2003-11-14 11:45:15.000000000 -0800
++++ libjackasyn-0.10/Makefile.in	2004-10-07 00:02:31.915756779 -0700
+@@ -13,7 +13,7 @@
+ 
+ 
+ prefix = @prefix@
+-
++libdir = @libdir@
+ 
+ all: static shared
+ 
+@@ -25,13 +25,12 @@
+ 	gcc -shared -Wl,-soname=libjackasyn.so.0 -o libjackasyn.so.$(VERSION) *.o $(LIBS)
+ 
+ install:
+-	-rm $(prefix)/lib/libjackasyn.so*
+-	install -m 644 libjackasyn.a $(prefix)/lib
+-	install -m 644 libjackasyn.so.$(VERSION) $(prefix)/lib
+-	install -m 644 libjackoss.h $(prefix)/include
+-	ln -s libjackasyn.so.$(VERSION) $(prefix)/lib/libjackasyn.so.0
+-	ln -s libjackasyn.so.$(VERSION) $(prefix)/lib/libjackasyn.so
+-	install -m 755 jacklaunch $(prefix)/bin
++	install -m 644 libjackasyn.a $(DESTDIR)$(libdir)
++	install -m 644 libjackasyn.so.$(VERSION) $(DESTDIR)$(libdir)
++	install -m 644 libjackoss.h $(DESTDIR)$(prefix)/include
++	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)$(libdir)/libjackasyn.so.0
++	ln -s libjackasyn.so.$(VERSION) $(DESTDIR)$(libdir)/libjackasyn.so
++	install -m 755 jacklaunch $(DESTDIR)$(prefix)/bin
+ 
+ test:
+ 	gcc -o test test.c libjackasyn.a -ljack -ldl -lm
diff --git a/media-libs/libjackasyn/libjackasyn-0.10.ebuild b/media-libs/libjackasyn/libjackasyn-0.10.ebuild
index fbda7543cc3b..02a2179c8f1f 100644
--- a/media-libs/libjackasyn/libjackasyn-0.10.ebuild
+++ b/media-libs/libjackasyn/libjackasyn-0.10.ebuild
@@ -1,17 +1,27 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libjackasyn/libjackasyn-0.10.ebuild,v 1.7 2004/09/01 17:11:58 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libjackasyn/libjackasyn-0.10.ebuild,v 1.8 2004/10/07 07:04:44 eradicator Exp $
+
+IUSE=""
+
+inherit eutils
 
 DESCRIPTION="An application/library for connecting OSS apps to Jackit."
 HOMEPAGE="http://gige.xdv.org/soft/libjackasyn"
 SRC_URI="http://devel.demudi.org/download/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 amd64"
+
 DEPEND="media-sound/jack-audio-connection-kit
 	media-libs/libsamplerate"
 
-IUSE=""
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-destdir.patch
+}
 
 src_compile() {
 	econf || die
@@ -19,12 +29,10 @@ src_compile() {
 }
 
 src_install() {
-	sed -i -e "s:prefix = /usr:prefix = ${D}/usr:" Makefile
-
-	dodir /usr/lib
-	dodir /usr/include
 	dodir /usr/bin
+	dodir /usr/$(get_libdir)
+	dodir /usr/include
 
-	emake install || die
-	dodoc AUTHORS CHANGELOG WORKING TODO COPYING
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS CHANGELOG WORKING TODO
 }