get_libdir-ized (#65871)

3 files changed, 17 insertions, 11 deletions

diff --git a/sys-libs/libaal/ChangeLog b/sys-libs/libaal/ChangeLog
index e74e10f7b5b5..2b8b1e09417a 100644
--- a/sys-libs/libaal/ChangeLog
+++ b/sys-libs/libaal/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libaal
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/ChangeLog,v 1.12 2004/09/19 21:17:45 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/ChangeLog,v 1.13 2004/10/01 14:35:23 blubb Exp $
+
+  01 Oct 2004; Simon Stelling <blubb@gentoo.org> libaal-1.0.1.ebuild,
+  libaal-1.0.2_pre1.ebuild:
+  get_libdir-ized
 
 *libaal-1.0.2_pre1 (19 Sep 2004)
 
diff --git a/sys-libs/libaal/libaal-1.0.1.ebuild b/sys-libs/libaal/libaal-1.0.1.ebuild
index 9ded785f63bf..290d2aba749d 100644
--- a/sys-libs/libaal/libaal-1.0.1.ebuild
+++ b/sys-libs/libaal/libaal-1.0.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.1.ebuild,v 1.3 2004/09/19 21:16:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.1.ebuild,v 1.4 2004/10/01 14:35:23 blubb Exp $
+
+inherit eutils
 
 DESCRIPTION="library required by reiser4progs"
 HOMEPAGE="http://www.namesys.com/v4/v4.html"
@@ -17,7 +19,7 @@ src_compile() {
 	econf \
 		--enable-stand-alone \
 		--enable-memory-manager \
-		--libdir=/lib || die "configure failed"
+		--libdir=/$(get_libdir) || die "configure failed"
 	emake || die "make failed"
 }
 
@@ -26,10 +28,10 @@ src_install() {
 	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
 
 	# move silly .a libs out of /
-	dodir /usr/lib
+	dodir /usr/$(get_libdir)
 	local l=""
 	for l in libaal libaal-alone ; do
-		mv ${D}/lib/${l}.{a,la} ${D}/usr/lib/
-		dosym ../usr/lib/${l}.a /lib/${l}.a
+		mv ${D}/$(get_libdir)/${l}.{a,la} ${D}/usr/$(get_libdir)/
+		dosym ../usr/$(get_libdir)/${l}.a /$(get_libdir)/${l}.a
 	done
 }
diff --git a/sys-libs/libaal/libaal-1.0.2_pre1.ebuild b/sys-libs/libaal/libaal-1.0.2_pre1.ebuild
index cb3567d68329..0e984f7783c3 100644
--- a/sys-libs/libaal/libaal-1.0.2_pre1.ebuild
+++ b/sys-libs/libaal/libaal-1.0.2_pre1.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/sys-libs/libaal/libaal-1.0.2_pre1.ebuild,v 1.2 2004/09/19 21:36:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libaal/libaal-1.0.2_pre1.ebuild,v 1.3 2004/10/01 14:35:23 blubb Exp $
 
 inherit eutils
 
@@ -23,7 +23,7 @@ src_compile() {
 	econf \
 		--enable-stand-alone \
 		--enable-memory-manager \
-		--libdir=/lib || die "configure failed"
+		--libdir=/$(get_libdir) || die "configure failed"
 	emake || die "make failed"
 }
 
@@ -32,11 +32,11 @@ src_install() {
 	dodoc AUTHORS BUGS CREDITS ChangeLog NEWS README THANKS TODO
 
 	# move silly .a libs out of /
-	dodir /usr/lib
+	dodir /usr/$(get_libdir)
 	local l=""
 	for l in libaal libaal-alone ; do
-		mv ${D}/lib/${l}.{a,la} ${D}/usr/lib/
-		dosym ../usr/lib/${l}.a /lib/${l}.a
+		mv ${D}/$(get_libdir)/${l}.{a,la} ${D}/usr/$(get_libdir)/
+		dosym ../usr/$(get_libdir)/${l}.a /$(get_libdir)/${l}.a
 		gen_usr_ldscript ${l}.so
 	done
 }