get_libdir fixes.

5 files changed, 20 insertions, 13 deletions

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/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
 }