diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-07 02:50:44 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2004-10-07 02:50:44 +0000 |
| commit | 4cdf71bcc11eba0ead2aa1fd488f20b9fc8a25f4 (patch) | |
| tree | a727c23004f1f63c4b2d0b88bfcb6998f590b489 /media-libs/libgphoto2 | |
| parent | get_libdir fixes, and no longer symlinking to old libasound lib. (Manifest re... (diff) | |
| download | gentoo-2-4cdf71bcc11eba0ead2aa1fd488f20b9fc8a25f4.tar.gz gentoo-2-4cdf71bcc11eba0ead2aa1fd488f20b9fc8a25f4.tar.bz2 gentoo-2-4cdf71bcc11eba0ead2aa1fd488f20b9fc8a25f4.zip | |
get_libdir fixes.
Diffstat (limited to 'media-libs/libgphoto2')
| -rw-r--r-- | media-libs/libgphoto2/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.1.3.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.1.4.ebuild | 10 |
3 files changed, 12 insertions, 8 deletions
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 } |