diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2007-02-21 17:32:08 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2007-02-21 17:32:08 +0000 |
| commit | 055ff9a4cc8b22318715da48ab751fc26e30fce1 (patch) | |
| tree | a65990da3d66b6ef37ac03cf5bd048e381d6a0a2 /sys-libs/ncurses | |
| parent | Accepting maintainership, cleaned out old gkrellm-1 version, and updated new ... (diff) | |
| download | gentoo-2-055ff9a4cc8b22318715da48ab751fc26e30fce1.tar.gz gentoo-2-055ff9a4cc8b22318715da48ab751fc26e30fce1.tar.bz2 gentoo-2-055ff9a4cc8b22318715da48ab751fc26e30fce1.zip | |
install wide second so /usr/bin binaries are the wide version
(Portage version: 2.1.2-r10)
Diffstat (limited to 'sys-libs/ncurses')
| -rw-r--r-- | sys-libs/ncurses/ncurses-5.6.ebuild | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/sys-libs/ncurses/ncurses-5.6.ebuild b/sys-libs/ncurses/ncurses-5.6.ebuild index 6b28ebba871e..ddc5e42c15f7 100644 --- a/sys-libs/ncurses/ncurses-5.6.ebuild +++ b/sys-libs/ncurses/ncurses-5.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.3 2007/02/21 17:26:10 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.6.ebuild,v 1.4 2007/02/21 17:32:08 vapier Exp $ inherit eutils flag-o-matic toolchain-funcs @@ -93,14 +93,14 @@ do_compile() { } src_install() { - # install unicode version first so that the non-unicode - # files overwrite the unicode versions + # install unicode version second so that the binaries in /usr/bin + # support both wide and narrow + cd "${WORKDIR}"/narrowc + emake DESTDIR="${D}" install || die "make narrowc install failed" if use unicode ; then cd "${WORKDIR}"/widec - make DESTDIR="${D}" install || die "make widec install failed" + emake DESTDIR="${D}" install || die "make widec install failed" fi - cd "${WORKDIR}"/narrowc - make DESTDIR="${D}" install || die "make narrowc install failed" if [[ ${CHOST} != *-darwin* ]] ; then # Move static and extraneous ncurses libraries out of /lib @@ -136,22 +136,10 @@ src_install() { echo "CONFIG_PROTECT_MASK=\"/etc/terminfo\"" > "${T}"/50ncurses doenvd "${T}"/50ncurses - if use build ; then - cd "${D}" - rm -rf usr/share/man - cd usr/share/terminfo - cp -pPR l/linux n/nxterm v/vt100 "${T}" - rm -rf * - mkdir l x v - cp -pPR "${T}"/linux l - cp -pPR "${T}"/nxterm x/xterm - cp -pPR "${T}"/vt100 v - else - use minimal && rm -r "${D}"/usr/share/terminfo - cd "${S}" - dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc - use doc && dohtml -r doc/html/ - fi + use minimal && rm -r "${D}"/usr/share/terminfo + cd "${S}" + dodoc ANNOUNCE MANIFEST NEWS README* TO-DO doc/*.doc + use doc && dohtml -r doc/html/ } pkg_preinst() { |