diff options
author | Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-02-18 13:51:57 +0100 |
---|---|---|
committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2017-02-18 13:52:11 +0100 |
commit | 83726af5c28885e3b68bc82959b2f730409b4cc5 (patch) | |
tree | 9404b9dc88dd293f93015db7d16d9895077f8488 /net-print/cups/cups-9999.ebuild | |
parent | kde-apps/kdebase-kioslaves: Drop obsolete alternative samba version dep (diff) | |
download | gentoo-83726af5c28885e3b68bc82959b2f730409b4cc5.tar.gz gentoo-83726af5c28885e3b68bc82959b2f730409b4cc5.tar.bz2 gentoo-83726af5c28885e3b68bc82959b2f730409b4cc5.zip |
net-print/cups: Restore prefix compatibility, bug 597728
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'net-print/cups/cups-9999.ebuild')
-rw-r--r-- | net-print/cups/cups-9999.ebuild | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 24b53a61b147..1257737e2e9f 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -191,7 +191,7 @@ multilib_src_configure() { --with-docdir="${EPREFIX}"/usr/share/cups/html \ --with-languages="${LINGUAS}" \ --with-system-groups=lpadmin \ - --with-xinetd=/etc/xinetd.d \ + --with-xinetd="${EPREFIX}"/etc/xinetd.d \ $(multilib_native_use_enable acl) \ $(use_enable dbus) \ $(use_enable debug) \ @@ -218,6 +218,12 @@ multilib_src_configure() { sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die + + # additional path corrections needed for prefix, see bug 597728 + sed -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die + sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die + sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die + sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" Makedefs || die } multilib_src_compile() { |