commit: 9906d9f344ceadb922d50fa6ca8955ee88ef18cd Author: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> AuthorDate: Wed May 24 21:10:03 2017 +0000 Commit: Ian Whyman <thev00d00 <AT> gentoo <DOT> org> CommitDate: Wed May 24 21:10:19 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9906d9f3
dev-lang/duktape: Respect libdir, actually install duktape.pc file Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-lang/duktape/duktape-2.1.0.ebuild | 21 +++++++++++++++------ dev-lang/duktape/files/duktape.pc | 2 +- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/dev-lang/duktape/duktape-2.1.0.ebuild b/dev-lang/duktape/duktape-2.1.0.ebuild index 3ec8d5a73f3..976fa042698 100644 --- 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 3aa14bf929a..56eff91ada9 100644 --- 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