get_libdir fixes.

35 files changed, 144 insertions, 78 deletions

diff --git a/media-libs/gdk-pixbuf/ChangeLog b/media-libs/gdk-pixbuf/ChangeLog
index 1ca68007ed17..f2ff2c6b94fc 100644
--- a/media-libs/gdk-pixbuf/ChangeLog
+++ b/media-libs/gdk-pixbuf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/gdk-pixbuf
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/ChangeLog,v 1.37 2004/09/20 17:52:51 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/ChangeLog,v 1.38 2004/10/07 02:52:27 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  gdk-pixbuf-0.22.0-r3.ebuild:
+  get_libdir fixes.
 
   20 Sep 2004; Bryan Østergaard,,, <kloeri@gentoo.org>
   gdk-pixbuf-0.22.0-r3.ebuild:
diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r3.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r3.ebuild
index 1a971e1908ec..1c5188a39653 100644
--- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r3.ebuild
+++ b/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r3.ebuild,v 1.6 2004/09/21 01:10:36 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.22.0-r3.ebuild,v 1.7 2004/10/07 02:52:27 eradicator Exp $
 
 inherit virtualx libtool gnome.org gnuconfig eutils
 
@@ -59,8 +59,8 @@ src_install() {
 
 	dosed -e "s:${D}::g" /usr/bin/gdk-pixbuf-config
 	#fix permissions on the loaders
-	chmod a+rx ${D}/usr/lib/gdk-pixbuf/loaders
-	chmod a+r ${D}/usr/lib/gdk-pixbuf/loaders/*
+	chmod a+rx ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders
+	chmod a+r ${D}/usr/$(get_libdir)/gdk-pixbuf/loaders/*
 
 	dodoc AUTHORS COPYING* ChangeLog INSTALL README NEWS TODO
 }
diff --git a/media-libs/ladspa-cmt/ChangeLog b/media-libs/ladspa-cmt/ChangeLog
index 972699724e85..6ab66e3edbc0 100644
--- a/media-libs/ladspa-cmt/ChangeLog
+++ b/media-libs/ladspa-cmt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ladspa-cmt
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ChangeLog,v 1.15 2004/09/22 10:23:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ChangeLog,v 1.16 2004/10/07 02:52:54 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ladspa-cmt-1.15.ebuild:
+  get_libdir fixes.
 
   22 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   ladspa-cmt-1.15.ebuild:
diff --git a/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild b/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild
index a09f1ef0cec4..c5e0a9b8679e 100644
--- a/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild
+++ b/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild,v 1.14 2004/09/22 10:23:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-cmt/ladspa-cmt-1.15.ebuild,v 1.15 2004/10/07 02:52:54 eradicator Exp $
 
 inherit eutils
 
@@ -39,7 +39,7 @@ src_compile() {
 
 src_install() {
 	insopts -m755
-	insinto /usr/lib/ladspa
+	insinto /usr/$(get_libdir)/ladspa
 	doins ../plugins/*.so || die "doins failed"
 	dodoc ../README       || die "dodoc failed"
 	dohtml ../doc/*       || die "dohtml failed"
diff --git a/media-libs/ladspa-sdk/ChangeLog b/media-libs/ladspa-sdk/ChangeLog
index facd078c4f59..a321790caa73 100644
--- a/media-libs/ladspa-sdk/ChangeLog
+++ b/media-libs/ladspa-sdk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/ladspa-sdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ChangeLog,v 1.20 2004/09/15 16:09:08 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ChangeLog,v 1.21 2004/10/07 02:53:46 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  ladspa-sdk-1.12-r2.ebuild:
+  get_libdir fixes.
 
   15 Sep 2004; Jeremy Huddleston <eradicator@gentoo.org>
   ladspa-sdk-1.12-r2.ebuild:
diff --git a/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild b/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild
index b8128b6490d0..256bc371a88a 100644
--- a/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild
+++ b/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild,v 1.5 2004/09/16 03:47:58 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ladspa-sdk/ladspa-sdk-1.12-r2.ebuild,v 1.6 2004/10/07 02:53:46 eradicator Exp $
 
 inherit eutils
 
@@ -46,7 +46,7 @@ src_test() {
 
 src_install() {
 	make \
-		INSTALL_PLUGINS_DIR=${D}/usr/lib/ladspa \
+		INSTALL_PLUGINS_DIR=${D}/usr/$(get_libdir)/ladspa \
 		INSTALL_INCLUDE_DIR=${D}/usr/include \
 		INSTALL_BINARY_DIR=${D}/usr/bin \
 		install || die "make install failed"
@@ -56,5 +56,5 @@ src_install() {
 
 	# Needed for apps like rezound
 	dodir /etc/env.d
-	echo "LADSPA_PATH=/usr/lib/ladspa" > ${D}/etc/env.d/60ladspa
+	echo "LADSPA_PATH=/usr/$(get_libdir)/ladspa" > ${D}/etc/env.d/60ladspa
 }
diff --git a/media-libs/libdvdcss/ChangeLog b/media-libs/libdvdcss/ChangeLog
index 3f5df83ecc59..3a5ed6394125 100644
--- a/media-libs/libdvdcss/ChangeLog
+++ b/media-libs/libdvdcss/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdvdcss
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.35 2004/09/24 21:14:08 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/ChangeLog,v 1.36 2004/10/07 02:55:54 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libdvdcss-1.2.8.ebuild:
+  get_libdir fixes.
 
   24 Sep 2004; kito@gentoo.org libdvdcss-1.2.8.ebuild:
   ~ppc-macos keyword
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild
index 846c30f3a545..f43449b77385 100644
--- a/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild
+++ b/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild,v 1.17 2004/09/24 21:14:08 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdcss/libdvdcss-1.2.8.ebuild,v 1.18 2004/10/07 02:55:54 eradicator Exp $
 
 DESCRIPTION="A portable abstraction library for DVD decryption"
 HOMEPAGE="http://developers.videolan.org/libdvdcss/"
@@ -18,9 +18,9 @@ pkg_preinst() {
 	# earlier builds
 	for x in libdvdcss.so.0 libdvdcss.so.1
 	do
-		if [ -f /usr/lib/${x} ] || [ -L /usr/lib/${x} ]
+		if [ -f /usr/$(get_libdir)/${x} ] || [ -L /usr/$(get_libdir)/${x} ]
 		then
-			rm -f /usr/lib/${x}
+			rm -f /usr/$(get_libdir)/${x}
 		fi
 	done
 }
@@ -47,19 +47,19 @@ src_install() {
 
 	# NOTE: this should be the last code in src_install() !!!
 
-	if [ -L ${D}/usr/lib/libdvdcss.so ]
+	if [ -L ${D}/usr/$(get_libdir)/libdvdcss.so ]
 	then
 		# on some locales the name of the file a symlink points to, is in the
 		# tenth field, and not the eleventh (bug #2908)
 		LC_ALL='C'
-		local realname="$(ls -l ${D}/usr/lib/libdvdcss.so |gawk '{print $11}')"
+		local realname="$(ls -l ${D}/usr/$(get_libdir)/libdvdcss.so |gawk '{print $11}')"
 		[ -z "${realname}" ] && \
-			realname="$(ls -l ${D}/usr/lib/libdvdcss.so |gawk '{print $10}')"
+			realname="$(ls -l ${D}/usr/$(get_libdir)/libdvdcss.so |gawk '{print $10}')"
 		[ -z "${realname}" ] && return 0
 
 		for x in libdvdcss.so.0 libdvdcss.so.1
 		do
-			dosym ${realname} /usr/lib/${x}
+			dosym ${realname} /usr/$(get_libdir)/${x}
 		done
 	fi
 }
diff --git a/media-libs/libexif/ChangeLog b/media-libs/libexif/ChangeLog
index 418b3e2589f1..21aef5bc6806 100644
--- a/media-libs/libexif/ChangeLog
+++ b/media-libs/libexif/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libexif
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.21 2004/10/04 05:42:03 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/ChangeLog,v 1.22 2004/10/07 02:49:21 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> :
+  get_libdir fixes.
 
   03 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
   libexif-0.6.10.ebuild:
diff --git a/media-libs/libexif/libexif-0.5.12-r1.ebuild b/media-libs/libexif/libexif-0.5.12-r1.ebuild
index 5f74749e1ebd..efc2736f4f37 100644
--- a/media-libs/libexif/libexif-0.5.12-r1.ebuild
+++ b/media-libs/libexif/libexif-0.5.12-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.5.12-r1.ebuild,v 1.7 2004/07/29 02:20:10 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libexif/libexif-0.5.12-r1.ebuild,v 1.8 2004/10/07 02:49:21 eradicator Exp $
 
-inherit flag-o-matic
+inherit flag-o-matic eutils
 
 IUSE="nls"
 
@@ -23,10 +23,10 @@ src_compile() {
 }
 
 src_install() {
-	dodir /usr/lib
+	dodir /usr/$(get_libdir)
 	dodir /usr/include/libexif
 	dodir /usr/share/locale
-	dodir /usr/lib/pkgconfig
+	dodir /usr/$(get_libdir)/pkgconfig
 	einstall || die
 
 	dodoc ChangeLog README
diff --git a/media-libs/libggi/ChangeLog b/media-libs/libggi/ChangeLog
index 4eee3acc07d5..878fd01d569b 100644
--- a/media-libs/libggi/ChangeLog
+++ b/media-libs/libggi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libggi
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/ChangeLog,v 1.14 2004/10/01 23:02:08 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/ChangeLog,v 1.15 2004/10/07 02:56:44 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libggi-2.0.1-r1.ebuild:
+  get_libdir fixes.
 
   02 Oct 2004; Markus Nigbur <pyrania@gentoo.org> libggi-2.0.1.ebuild:
   hooray for epatch!
diff --git a/media-libs/libggi/libggi-2.0.1-r1.ebuild b/media-libs/libggi/libggi-2.0.1-r1.ebuild
index 88b46e12048e..0fdcd5391f70 100644
--- a/media-libs/libggi/libggi-2.0.1-r1.ebuild
+++ b/media-libs/libggi/libggi-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/libggi-2.0.1-r1.ebuild,v 1.11 2004/07/29 03:26:10 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libggi/libggi-2.0.1-r1.ebuild,v 1.12 2004/10/07 02:56:44 eradicator Exp $
 
 IUSE="X aalib svga fbcon directfb"
 
@@ -62,7 +62,7 @@ src_install () {
 	# This la file seems to bug mesa.
 # Hopefully libtoolize will fix for mesa-3.5.  The *.la needed
 # for mesa-5.0 in the works - <azarah@gentoo.org> (28 Dec 2002)
-#	rm ${D}/usr/lib/*.la
+#	rm ${D}/usr/$(get_libdir)/*.la
 
 	dodoc ChangeLog* FAQ NEWS README TODO
 	docinto txt
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog
index 621de085d1ea..bcd37a5044db 100644
--- a/media-libs/libgphoto2/ChangeLog
+++ b/media-libs/libgphoto2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libgphoto2
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.33 2004/07/31 02:50:26 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.34 2004/10/07 02:50:44 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libgphoto2-2.1.3.ebuild, libgphoto2-2.1.4.ebuild:
+  get_libdir fixes.
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> libgphoto2-2.1.4.ebuild:
   stable on ppc64, bug #57131
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
index 0d282f3a456b..f6b13b0fbd20 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild,v 1.8 2004/07/13 01:12:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.3.ebuild,v 1.9 2004/10/07 02:50:44 eradicator Exp $
 
 inherit libtool eutils
 
@@ -93,5 +93,5 @@ src_install() {
 	chmod +x ${D}/etc/hotplug/usb/usbcam
 
 	HOTPLUG_USERMAP="${D}/etc/hotplug/usb/usbcam.usermap"
-	${D}/usr/lib/libgphoto2/print-usb-usermap >> ${HOTPLUG_USERMAP}
+	${D}/usr/$(get_libdir)/libgphoto2/print-usb-usermap >> ${HOTPLUG_USERMAP}
 }
diff --git a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
index e5b261efb751..5bd1955b5f74 100644
--- a/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild,v 1.14 2004/07/31 02:50:26 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.4.ebuild,v 1.15 2004/10/07 02:50:44 eradicator Exp $
 
 inherit libtool eutils
 
@@ -103,14 +103,14 @@ src_install() {
 pkg_postinst() {
 	einfo "Generating usbcam-gphoto2.usermap .."
 	HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap"
-	if [ -x ${ROOT}/usr/lib/libgphoto2/print-usb-usermap ]; then
+	if [ -x ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap ]; then
 		echo "# !!! DO NOT EDIT THIS FILE !!! This file is automatically generated." > ${ROOT}/${HOTPLUG_USERMAP}
 		echo "# Put your custom entries in /etc/hotplug/usb/usbcam.usermap" >> ${ROOT}/${HOTPLUG_USERMAP}
-		${ROOT}/usr/lib/libgphoto2/print-usb-usermap >> ${ROOT}/${HOTPLUG_USERMAP}
+		${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap >> ${ROOT}/${HOTPLUG_USERMAP}
 	else
-		eerror "Unable to find ${ROOT}/usr/lib/libgphoto2/print-usb-usermap"
+		eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap"
 		eerror "and therefore unable to generate hotplug usermap."
 		eerror "You will have to manually generate it by running:"
-		eerror " /usr/lib/libgphoto2/print-usb-usermap > ${HOTPLUG_USERMAP}"
+		eerror " /usr/$(get_libdir)/libgphoto2/print-usb-usermap > ${HOTPLUG_USERMAP}"
 	fi
 }
diff --git a/media-libs/libid3tag/ChangeLog b/media-libs/libid3tag/ChangeLog
index c45780f9e969..8f3864e43b59 100644
--- a/media-libs/libid3tag/ChangeLog
+++ b/media-libs/libid3tag/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libid3tag
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/ChangeLog,v 1.20 2004/07/22 10:19:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/ChangeLog,v 1.21 2004/10/07 02:57:45 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libid3tag-0.15.1b.ebuild:
+  get_libdir fixes.
 
   22 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> libid3tag-0.15.1b.ebuild:
   Added to macos. See bug #57448
diff --git a/media-libs/libid3tag/libid3tag-0.15.1b.ebuild b/media-libs/libid3tag/libid3tag-0.15.1b.ebuild
index 5b06e6c8b551..6da6eeb60428 100644
--- a/media-libs/libid3tag/libid3tag-0.15.1b.ebuild
+++ b/media-libs/libid3tag/libid3tag-0.15.1b.ebuild
@@ -1,13 +1,14 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/libid3tag-0.15.1b.ebuild,v 1.11 2004/09/16 02:04:19 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libid3tag/libid3tag-0.15.1b.ebuild,v 1.12 2004/10/07 02:57:45 eradicator Exp $
 
 IUSE="debug"
 
+inherit eutils
+
 DESCRIPTION="The MAD id3tag library"
 HOMEPAGE="http://mad.sourceforge.net"
 SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
-RESTRICT="nomirror"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -34,7 +35,7 @@ src_install() {
 	dodoc CHANGES COPYRIGHT CREDITS README TODO VERSION
 
 	# This file must be updated with every version update
-	dodir /usr/lib/pkgconfig
-	insinto /usr/lib/pkgconfig
+	dodir /usr/$(get_libdir)/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${FILESDIR}/id3tag.pc
 }
diff --git a/media-libs/libmad/ChangeLog b/media-libs/libmad/ChangeLog
index e73eb3ecd985..8b5ff7d6f676 100644
--- a/media-libs/libmad/ChangeLog
+++ b/media-libs/libmad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmad
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.23 2004/07/22 10:28:08 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/ChangeLog,v 1.24 2004/10/07 02:58:33 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libmad-0.15.1b.ebuild:
+  get_libdir fixes.
 
   22 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> libmad-0.15.1b.ebuild:
   Added to macos. See bug #57448
diff --git a/media-libs/libmad/libmad-0.15.1b.ebuild b/media-libs/libmad/libmad-0.15.1b.ebuild
index 9977873d7f19..d91be3f5ff11 100644
--- a/media-libs/libmad/libmad-0.15.1b.ebuild
+++ b/media-libs/libmad/libmad-0.15.1b.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b.ebuild,v 1.12 2004/09/16 02:04:38 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmad/libmad-0.15.1b.ebuild,v 1.13 2004/10/07 02:58:33 eradicator Exp $
 
 IUSE="debug"
 
+inherit eutils
+
 DESCRIPTION="\"M\"peg \"A\"udio \"D\"ecoder library"
 HOMEPAGE="http://mad.sourceforge.net"
 SRC_URI="mirror://sourceforge/mad/${P}.tar.gz"
@@ -41,7 +43,7 @@ src_install() {
 	dodoc CHANGES COPYRIGHT CREDITS README TODO VERSION
 
 	# This file must be updated with each version update
-	dodir /usr/lib/pkgconfig
-	insinto /usr/lib/pkgconfig
+	dodir /usr/$(get_libdir)/pkgconfig
+	insinto /usr/$(get_libdir)/pkgconfig
 	doins ${FILESDIR}/mad.pc
 }
diff --git a/media-libs/libmpeg3/ChangeLog b/media-libs/libmpeg3/ChangeLog
index 4d6f83ad30c1..b4b59c2c62d7 100644
--- a/media-libs/libmpeg3/ChangeLog
+++ b/media-libs/libmpeg3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libmpeg3
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.27 2004/09/30 13:46:24 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/ChangeLog,v 1.28 2004/10/07 02:59:46 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  libmpeg3-1.5.2.ebuild:
+  get_libdir fixes.
 
   30 Sep 2004; Patrick Kursawe <phosphan@gentoo.org> libmpeg3-1.5.2.ebuild:
   Will get linking correctly now even if liba52 was compiled with djbfft.
diff --git a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild b/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild
index 9eacc5f8295a..53bea330b431 100644
--- a/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild
+++ b/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.13 2004/09/30 13:46:24 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libmpeg3/libmpeg3-1.5.2.ebuild,v 1.14 2004/10/07 02:59:46 eradicator Exp $
 
 inherit flag-o-matic eutils gcc
 
@@ -39,7 +39,7 @@ src_unpack() {
 	ln -s /usr/include/a52dec a52dec-0.7.3/include
 	local libs
 	libs=" -la52"
-	if grep -q djbfft ${ROOT}usr/lib/liba52.a; then
+	if grep -q djbfft ${ROOT}usr/$(get_libdir)/liba52.a; then
 		libs="${libs} -ldjbfft"
 	fi
 	sed -i "/LIBS = /s:$: -L\${ROOT}usr/lib ${libs}:" Makefile
diff --git a/media-libs/libnjb/ChangeLog b/media-libs/libnjb/ChangeLog
index 0207a7518478..51659d4cd629 100644
--- a/media-libs/libnjb/ChangeLog
+++ b/media-libs/libnjb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libnjb
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.12 2004/10/05 20:16:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/ChangeLog,v 1.13 2004/10/07 03:00:27 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> libnjb-1.2.ebuild:
+  get_libdir fixes.
 
 *libnjb-1.2 (05 Oct 2004)
 
diff --git a/media-libs/libnjb/libnjb-1.2.ebuild b/media-libs/libnjb/libnjb-1.2.ebuild
index 2723f26a197e..dbf78a072132 100644
--- a/media-libs/libnjb/libnjb-1.2.ebuild
+++ b/media-libs/libnjb/libnjb-1.2.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.2.ebuild,v 1.2 2004/10/05 20:18:56 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libnjb/libnjb-1.2.ebuild,v 1.3 2004/10/07 03:00:27 eradicator Exp $
 
 IUSE=""
 
+inherit eutils
+
 DESCRIPTION="libnjb is a C library and API for communicating with the Creative Nomad JukeBox digital audio player under BSD and Linux."
 HOMEPAGE="http://libnjb.sourceforge.net/"
 SRC_URI="mirror://sourceforge/libnjb/${P}.tar.gz"
@@ -28,7 +30,7 @@ src_install() {
 	einstall || die
 
 	# Backwards compatability
-	dosym libnjb.so /usr/lib/libnjb.so.0
+	dosym libnjb.so /usr/$(get_libdir)/libnjb.so.0
 	prepalldocs
 	dodoc FAQ LICENSE INSTALL CHANGES README
 	exeinto /etc/hotplug/usb/
diff --git a/media-libs/ming/ChangeLog b/media-libs/ming/ChangeLog
index bea9ad730149..c639c658f657 100644
--- a/media-libs/ming/ChangeLog
+++ b/media-libs/ming/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/ming
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.15 2004/08/20 04:03:07 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ChangeLog,v 1.16 2004/10/07 03:00:54 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> ming-0.2a.ebuild:
+  get_libdir fixes.
 
   19 Aug 2004; Tom Gall <tgall@gentoo.org> ming-0.2a.ebuild:
   stable on ppc64
diff --git a/media-libs/ming/ming-0.2a.ebuild b/media-libs/ming/ming-0.2a.ebuild
index fca02fcb090d..27d281956042 100644
--- a/media-libs/ming/ming-0.2a.ebuild
+++ b/media-libs/ming/ming-0.2a.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.19 2004/08/20 04:03:07 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/ming/ming-0.2a.ebuild,v 1.20 2004/10/07 03:00:54 eradicator Exp $
 
 inherit eutils
 
@@ -33,7 +33,7 @@ src_install() {
 	dolib.a  libming.a
 	insinto /usr/include
 	doins ming.h
-	exeinto /usr/lib/ming
+	exeinto /usr/$(get_libdir)/ming
 	doexe util/{bindump,hexdump,listswf,listfdb,listmp3,listjpeg,makefdb,swftophp}
 	dodoc CHANGES CREDITS README TODO
 	newdoc util/README README.util
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index 705b15a6bd56..dc9a810e8543 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/netpbm
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.49 2004/10/02 21:15:36 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.50 2004/10/07 03:01:46 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  netpbm-10.20.ebuild:
+  get_libdir fixes.
 
   02 Oct 2004; Olivier Crete <tester@gentoo.org> netpbm-10.20.ebuild:
   Marking x86 wrt security bug #65647
diff --git a/media-libs/netpbm/netpbm-10.20.ebuild b/media-libs/netpbm/netpbm-10.20.ebuild
index 289e2b4b2d2e..611b1bb1ac30 100644
--- a/media-libs/netpbm/netpbm-10.20.ebuild
+++ b/media-libs/netpbm/netpbm-10.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.20.ebuild,v 1.11 2004/10/03 04:54:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.20.ebuild,v 1.12 2004/10/07 03:01:46 eradicator Exp $
 
 inherit flag-o-matic gcc
 
@@ -26,7 +26,7 @@ src_unpack() {
 
 	if use svga ; then
 		echo "LINUXSVGAHDR_DIR = /usr/include" >> Makefile.config
-		echo "LINUXSVGALIB = /usr/lib/libvga.so" >> Makefile.config
+		echo "LINUXSVGALIB = /usr/$(get_libdir)/libvga.so" >> Makefile.config
 	fi
 
 	if use jpeg ; then
@@ -67,7 +67,7 @@ src_install() {
 	rm -rf ${D}/usr/{VERSION,misc}
 
 	# Fix symlink not being created.
-	dosym `basename ${D}/usr/lib/libnetpbm.so.*` /usr/lib/libnetpbm.so
+	dosym `basename ${D}/usr/$(get_libdir)/libnetpbm.so.*` /usr/$(get_libdir)/libnetpbm.so
 
 	dodir /usr/share
 	rm -rf ${D}/usr/bin/doc.url
diff --git a/media-libs/pdflib/ChangeLog b/media-libs/pdflib/ChangeLog
index 1baace000a3e..e17674e8fd00 100644
--- a/media-libs/pdflib/ChangeLog
+++ b/media-libs/pdflib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/pdflib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.39 2004/07/31 03:25:03 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/ChangeLog,v 1.40 2004/10/07 03:02:34 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  pdflib-5.0.2.ebuild:
+  get_libdir fixes.
 
   31 Jul 2004; Tom Gall <tgall@gentoo.org> pdflib-5.0.2.ebuild:
   stable on ppc64, bug #57147
diff --git a/media-libs/pdflib/pdflib-5.0.2.ebuild b/media-libs/pdflib/pdflib-5.0.2.ebuild
index 085c037ebb6f..219b452fe061 100644
--- a/media-libs/pdflib/pdflib-5.0.2.ebuild
+++ b/media-libs/pdflib/pdflib-5.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-5.0.2.ebuild,v 1.20 2004/07/31 03:25:03 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/pdflib/pdflib-5.0.2.ebuild,v 1.21 2004/10/07 03:02:34 eradicator Exp $
 
 MY_PN="${PN/pdf/PDF}-Lite"
 MY_P="${MY_PN}-${PV}-Unix-src"
@@ -65,10 +65,10 @@ src_install() {
 			|cut -d ' ' -f 4`"
 		local perlarch="`/usr/bin/perl -v |grep 'This is perl' \
 			|cut -d ' ' -f 7`"
-		dodir /usr/lib/perl${perlmajver/v/}/site_perl/${perlver/v/}/${perlarch}
+		dodir /usr/$(get_libdir)/perl${perlmajver/v/}/site_perl/${perlver/v/}/${perlarch}
 	fi
 	if use python && [ -x /usr/bin/python ] ; then
-		dodir /usr/lib/python${PYVER}/lib-dynload
+		dodir /usr/$(get_libdir)/python${PYVER}/lib-dynload
 	fi
 	#next line required for proper install
 	dodir /usr/bin
diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index b8dddb845d83..25013998babd 100644
--- a/media-libs/t1lib/ChangeLog
+++ b/media-libs/t1lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/t1lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.29 2004/09/30 00:45:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.30 2004/10/07 03:03:46 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> t1lib-1.3.1.ebuild,
+  t1lib-5.0.2.ebuild:
+  get_libdir fixes.
 
   30 Jul 2004; Tom Gall <tgall@gentoo.org> t1lib-5.0.2.ebuild:
   stable on ppc64
diff --git a/media-libs/t1lib/t1lib-1.3.1.ebuild b/media-libs/t1lib/t1lib-1.3.1.ebuild
index 739497a25624..8ee47777ff47 100644
--- a/media-libs/t1lib/t1lib-1.3.1.ebuild
+++ b/media-libs/t1lib/t1lib-1.3.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-1.3.1.ebuild,v 1.23 2004/07/14 20:31:06 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-1.3.1.ebuild,v 1.24 2004/10/07 03:03:46 eradicator Exp $
 
-inherit gnuconfig
+inherit gnuconfig eutils
 
 IUSE="X"
 
@@ -54,14 +54,14 @@ src_install() {
 		doins t1libx.h
 		ln -s -f libt1x.lai .libs/libt1x.la
 		dolib .libs/libt1x.{la,a,so.1.3.1}
-		dosym libt1x.so.1.3.1 /usr/lib/libt1x.so.1
-		dosym libt1x.so.1.3.1 /usr/lib/libt1x.so
+		dosym libt1x.so.1.3.1 /usr/$(get_libdir)/libt1x.so.1
+		dosym libt1x.so.1.3.1 /usr/$(get_libdir)/libt1x.so
 	)
 
 	ln -s -f libt1.lai .libs/libt1.la
 	dolib .libs/libt1.{la,a,so.1.3.1}
-	dosym libt1.so.1.3.1 /usr/lib/libt1.so.1
-	dosym libt1.so.1.3.1 /usr/lib/libt1.so
+	dosym libt1.so.1.3.1 /usr/$(get_libdir)/libt1.so.1
+	dosym libt1.so.1.3.1 /usr/$(get_libdir)/libt1.so
 	insinto /etc/t1lib
 	doins t1lib.config
 
diff --git a/media-libs/t1lib/t1lib-5.0.2.ebuild b/media-libs/t1lib/t1lib-5.0.2.ebuild
index 0b12110ce7ac..962b3afa8c1d 100644
--- a/media-libs/t1lib/t1lib-5.0.2.ebuild
+++ b/media-libs/t1lib/t1lib-5.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.2.ebuild,v 1.6 2004/07/30 20:17:49 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.2.ebuild,v 1.7 2004/10/07 03:03:46 eradicator Exp $
 
 inherit gnuconfig flag-o-matic
 
@@ -53,14 +53,14 @@ src_install() {
 		doins t1libx.h
 		ln -s -f libt1x.lai .libs/libt1x.la
 		dolib .libs/libt1x.{la,a,so.${PV}}
-		dosym libt1x.so.${PV} /usr/lib/libt1x.so.${PV%%.*}
-		dosym libt1x.so.${PV} /usr/lib/libt1x.so
+		dosym libt1x.so.${PV} /usr/$(get_libdir)/libt1x.so.${PV%%.*}
+		dosym libt1x.so.${PV} /usr/$(get_libdir)/libt1x.so
 	)
 
 	ln -s -f libt1.lai .libs/libt1.la
 	dolib .libs/libt1.{la,a,so.${PV}}
-	dosym libt1.so.${PV} /usr/lib/libt1.so.${PV%%.*}
-	dosym libt1.so.${PV} /usr/lib/libt1.so
+	dosym libt1.so.${PV} /usr/$(get_libdir)/libt1.so.${PV%%.*}
+	dosym libt1.so.${PV} /usr/$(get_libdir)/libt1.so
 	insinto /etc/t1lib
 	doins t1lib.config
 
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index 53b73de6ee5e..37e338999d7b 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.149 2004/09/30 14:08:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.150 2004/10/07 03:04:58 eradicator Exp $
+
+  06 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  xine-lib-1_rc5-r3.ebuild, xine-lib-1_rc6.ebuild:
+  get_libdir fixes.
 
   30 Sep 2004; Patrick Kursawe <phosphan@gentoo.org>
   -files/xine-lib-1_rc3-configure-sparc.patch,
diff --git a/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild b/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
index d25a1a4a3b20..2cd31ef47957 100644
--- a/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild,v 1.12 2004/09/30 14:08:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc5-r3.ebuild,v 1.13 2004/10/07 03:04:58 eradicator Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -106,7 +106,7 @@ src_compile() {
 
 	# the win32 codec path should ignore $(get_libdir) and always use lib
 	use avi	&& use x86 \
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
+		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
 		|| myconf="${myconf} --disable-asf"
 
 	use sparc \
diff --git a/media-libs/xine-lib/xine-lib-1_rc6.ebuild b/media-libs/xine-lib/xine-lib-1_rc6.ebuild
index da0fdd747549..62e3f9ca8c0f 100644
--- a/media-libs/xine-lib/xine-lib-1_rc6.ebuild
+++ b/media-libs/xine-lib/xine-lib-1_rc6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc6.ebuild,v 1.8 2004/09/30 14:08:35 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc6.ebuild,v 1.9 2004/10/07 03:04:58 eradicator Exp $
 
 inherit eutils flag-o-matic gcc libtool
 
@@ -94,7 +94,7 @@ src_compile() {
 
 	# the win32 codec path should ignore $(get_libdir) and always use lib
 	use avi	&& use x86 \
-		&& myconf="${myconf} --with-w32-path=/usr/lib/win32" \
+		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
 		|| myconf="${myconf} --disable-asf"
 
 	use sparc \