get_libdir fixin.

4 files changed, 28 insertions, 14 deletions

diff --git a/media-libs/glut/ChangeLog b/media-libs/glut/ChangeLog
index ce2e39d5f815..6d6fbce60335 100644
--- a/media-libs/glut/ChangeLog
+++ b/media-libs/glut/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/glut
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.16 2004/07/31 00:06:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/ChangeLog,v 1.17 2004/10/05 10:24:36 eradicator Exp $
+
+  05 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> glut-3.7-r2.ebuild,
+  glut-3.7.1.ebuild:
+  get_libdir fixin.
 
   30 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org> glut-3.7.1.ebuild:
   always gnuconfig_update; elibtoolize in src_unpack; tidy
diff --git a/media-libs/glut/Manifest b/media-libs/glut/Manifest
index a6c057169e26..776777419f4b 100644
--- a/media-libs/glut/Manifest
+++ b/media-libs/glut/Manifest
@@ -1,6 +1,16 @@
-MD5 303eac12385424d76f560260dade1727 ChangeLog 2035
-MD5 a8f0302f998cccb8face3ea30ff00ecf glut-3.7-r2.ebuild 1151
-MD5 9ecaaea677a57059ddd69d9a63c360d4 glut-3.7.1.ebuild 1164
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 0a7151e6f32f533a32dfa166b9d7deb9 glut-3.7-r2.ebuild 1233
+MD5 9d2099f608b3dd3ba93d863073a81ce7 glut-3.7.1.ebuild 1192
+MD5 dfa56ed74d000a39f3d2178646feabde ChangeLog 2155
 MD5 18422995bf2dc2a319cb0d41a6af2542 files/digest-glut-3.7-r2 135
 MD5 a0cb6a15efc7e677e7ce9d58b66417a8 files/digest-glut-3.7.1 131
 MD5 e721299e4a30ba46f1edcd8b8510bcb6 files/glutscript.sh 978
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBYnaBArHZZzCEUG0RAmj4AJ4sZmDovWgeajr8XOkUyuWTXlySDgCfSiuV
+RDxY0eK205PH23URLONLB2A=
+=5Gxn
+-----END PGP SIGNATURE-----
diff --git a/media-libs/glut/glut-3.7-r2.ebuild b/media-libs/glut/glut-3.7-r2.ebuild
index b702b3e409f3..5f9ab7684b7f 100644
--- a/media-libs/glut/glut-3.7-r2.ebuild
+++ b/media-libs/glut/glut-3.7-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/glut/glut-3.7-r2.ebuild,v 1.16 2004/07/14 19:41:21 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7-r2.ebuild,v 1.17 2004/10/05 10:24:36 eradicator Exp $
 
 MESA_VER="4.0.1"
 S=${WORKDIR}/Mesa-${MESA_VER}
@@ -30,14 +30,14 @@ src_compile() {
 
 src_install() {
 
-	insinto /usr/lib
+	insinto /usr/$(get_libdir)
 	doins ${S}/src-glut/libglut.la
-	dosed -e "s: -L${S}/si-glu : -L/usr/lib :" /usr/lib/libglut.la
-	dosed -e "s:/usr/local/lib:/usr/lib:g" /usr/lib/libglut.la
-	dosed -e "s:installed=no:installed=yes:" /usr/lib/libglut.la
+	dosed -e "s: -L${S}/si-glu : -L/usr/$(get_libdir) :" /usr/$(get_libdir)/libglut.la
+	dosed -e "s:/usr/local/$(get_libdir):/usr/$(get_libdir):g" /usr/$(get_libdir)/libglut.la
+	dosed -e "s:installed=no:installed=yes:" /usr/$(get_libdir)/libglut.la
 
 	dolib.so ${S}/src-glut/.libs/libglut.so.${PV}.0
-	dosym libglut.so.${PV}.0 /usr/lib/libglut.so
+	dosym libglut.so.${PV}.0 /usr/$(get_libdir)/libglut.so
 	preplib
 
 	insinto /usr/include/GL
diff --git a/media-libs/glut/glut-3.7.1.ebuild b/media-libs/glut/glut-3.7.1.ebuild
index 49699e8b87d2..8fe0b841c05e 100644
--- a/media-libs/glut/glut-3.7.1.ebuild
+++ b/media-libs/glut/glut-3.7.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/glut/glut-3.7.1.ebuild,v 1.20 2004/07/31 00:06:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7.1.ebuild,v 1.21 2004/10/05 10:24:36 eradicator Exp $
 
-inherit libtool gnuconfig
+inherit libtool gnuconfig eutils
 
 MESA_VER="5.0"
 DESCRIPTION="The OpenGL Utility Toolkit (GLUT)"
@@ -35,11 +35,11 @@ src_compile() {
 }
 
 src_install() {
-	insinto /usr/lib
+	insinto /usr/$(get_libdir)
 	newins ${S}/src-glut/.libs/libglut.lai libglut.la || die "libtools"
 
 	dolib.so ${S}/src-glut/.libs/libglut.so.${PV}
-	dosym libglut.so.${PV} /usr/lib/libglut.so || die "libraries"
+	dosym libglut.so.${PV} /usr/$(get_libdir)/libglut.so || die "libraries"
 	preplib
 
 	insinto /usr/include/GL