diff options
author | Fabian Groffen <grobian@gentoo.org> | 2010-06-03 06:07:41 +0000 |
---|---|---|
committer | Fabian Groffen <grobian@gentoo.org> | 2010-06-03 06:07:41 +0000 |
commit | 2bbf1b67e479a9de01d1cd7fbbe451ae86986bf2 (patch) | |
tree | 231280872932fd86099abedf4c77ee73c0b817b7 /dev-libs | |
parent | Version bump. Build and install documentation using yard. (diff) | |
download | gentoo-2-2bbf1b67e479a9de01d1cd7fbbe451ae86986bf2.tar.gz gentoo-2-2bbf1b67e479a9de01d1cd7fbbe451ae86986bf2.tar.bz2 gentoo-2-2bbf1b67e479a9de01d1cd7fbbe451ae86986bf2.zip |
Make ebuild Prefix aware
(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)
Diffstat (limited to 'dev-libs')
-rw-r--r-- | dev-libs/dbxml/ChangeLog | 5 | ||||
-rw-r--r-- | dev-libs/dbxml/dbxml-2.5.16-r1.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/dev-libs/dbxml/ChangeLog b/dev-libs/dbxml/ChangeLog index 288cfcab5235..2754a1cb4b2e 100644 --- a/dev-libs/dbxml/ChangeLog +++ b/dev-libs/dbxml/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-libs/dbxml # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.9 2010/06/01 21:25:54 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/ChangeLog,v 1.10 2010/06/03 06:07:41 grobian Exp $ + + 02 Jun 2010; Fabian Groffen <grobian@gentoo.org> dbxml-2.5.16-r1.ebuild: + Make ebuild Prefix aware *dbxml-2.5.16-r1 (01 Jun 2010) diff --git a/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild b/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild index 4d34481dd475..c5500e24996f 100644 --- a/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild +++ b/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild,v 1.1 2010/06/01 21:25:54 dev-zero Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbxml/dbxml-2.5.16-r1.ebuild,v 1.2 2010/06/03 06:07:41 grobian Exp $ EAPI="3" PYTHON_DEPEND="python? 2" @@ -103,21 +103,21 @@ src_configure() { cd "${S}/build_unix" #Needed despite db_version stuff above - append-flags -I/usr/include/db${DB_VER} + append-flags -I"${EPREFIX}"/usr/include/db${DB_VER} local myconf="" # use_enable doesn't work here due to a different syntax use java && myconf="${myconf} --enable-java" - use tcl && myconf="${myconf} --enable-tcl --with-tcl=/usr/$(get_libdir)" + use tcl && myconf="${myconf} --enable-tcl --with-tcl=${EPREFIX}/usr/$(get_libdir)" export ac_cv_prog_path_strip="missing_strip" ECONF_SOURCE="../" \ JAVAPREFIX="${JAVA_HOME}" \ econf \ - --with-berkeleydb=/usr \ - --with-xqilla=/usr \ - --with-xerces=/usr \ + --with-berkeleydb="${EPREFIX}"/usr \ + --with-xqilla="${EPREFIX}"/usr \ + --with-xerces="${EPREFIX}"/usr \ ${myconf} } @@ -147,12 +147,12 @@ src_install() { # somewhat broken build system emake DESTDIR="${D}" install || die "emake install failed" - use doc && dohtml -A pdf -r "${D}"/usr/docs/* - rm -rf "${D}/usr/docs" + use doc && dohtml -A pdf -r "${ED}"/usr/docs/* + rm -rf "${ED}/usr/docs" if use java ; then - java-pkg_dojar "${D}/usr/$(get_libdir)/dbxml.jar" - rm "${D}/usr/$(get_libdir)/dbxml.jar" + java-pkg_dojar "${ED}/usr/$(get_libdir)/dbxml.jar" + rm "${ED}/usr/$(get_libdir)/dbxml.jar" fi if use python ; then |