dev-lang/duktape: Respect libdir, actually install duktape.pc file

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/dev-lang/duktape/duktape-2.1.0.ebuild b/dev-lang/duktape/duktape-2.1.0.ebuild
index 3ec8d5a73f3c3d1fb9ec7afd434c9f5ce0adef9d..976fa042698aeca65c314c7e7d40724544e08f6d 100644 (file)
--- a/dev-lang/duktape/duktape-2.1.0.ebuild
+++ b/dev-lang/duktape/duktape-2.1.0.ebuild
@@ -18,17 +18,26 @@ RDEPEND="${DEPEND}"
 src_prepare() {
        eapply_user
 
+       # Set install path
        sed -i "s#INSTALL_PREFIX=/usr/local#INSTALL_PREFIX=${D::-1}/usr#" \
-                       Makefile.sharedlibrary || die "failed to sed makefile"
+                       Makefile.sharedlibrary || die "failed to set install path"
 
-       cp "${FILESDIR}/${PN}.pc" "${WORKDIR}" || die
-       sed -i "s#VERSION#${PV}#" "${WORKDIR}/${PN}.pc" || die
+       # Edit pkgconfig
+       sed "s#VERSION#${PV}#" "${FILESDIR}/${PN}.pc" > "${S}/${PN}.pc" || die
+       sed -i "s#LIBDIR#$(get_libdir)#" "${S}/${PN}.pc" || die
 
-       mv Makefile.sharedlibrary Makefile || die "faile to mv makefile"
+       # Set lib folder
+       sed -i "s#(INSTALL_PREFIX)/lib#(INSTALL_PREFIX)/$(get_libdir)#" \
+               Makefile.sharedlibrary || die
+
+       mv Makefile.sharedlibrary Makefile || die "failed to rename makefile"
 }
 
 src_install() {
-       dodir "/usr/lib"
-       dodir "/usr/include"
+       dodir /usr/$(get_libdir)
+       dodir /usr/include
        emake install
+
+       insinto /usr/$(get_libdir)/pkgconfig/
+       doins "${S}/${PN}.pc"
 }

diff --git a/dev-lang/duktape/files/duktape.pc b/dev-lang/duktape/files/duktape.pc
index 3aa14bf929a1ff901b4b62487e8ec78fa30ac3bb..56eff91ada9e6ebfdd65880d428959bbf4a04470 100644 (file)
--- a/dev-lang/duktape/files/duktape.pc
+++ b/dev-lang/duktape/files/duktape.pc
@@ -1,6 +1,6 @@
 prefix=/usr
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
+libdir=${exec_prefix}/LIBDIR
 includedir=${prefix}/include
 
 Name: duktape