|
Line
Link Here
|
| 0 |
-- /usr/lib/portage/bin/ebuild.sh 2007-03-09 18:25:04.000000000 -0500 |
0 |
++ ebuild.sh 2007-05-14 15:03:05.000000000 -0400 |
|
Lines 588-598
Link Here
|
| 588 |
CONF_LIBDIR="${!LIBDIR_VAR}" |
588 |
CONF_LIBDIR="${!LIBDIR_VAR}" |
| 589 |
fi |
589 |
fi |
| 590 |
unset LIBDIR_VAR |
590 |
unset LIBDIR_VAR |
|
|
591 |
|
| 592 |
local EI_DESTLIBDIR="" |
| 591 |
if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then |
593 |
if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then |
| 592 |
EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}" |
594 |
EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}" |
| 593 |
EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})" |
595 |
EI_DESTLIBDIR="libdir=$(strip_duplicate_slashes ${EI_DESTLIBDIR})" |
| 594 |
EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${EXTRA_EINSTALL}" |
|
|
| 595 |
unset EI_DESTLIBDIR |
| 596 |
fi |
596 |
fi |
| 597 |
|
597 |
|
| 598 |
if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then |
598 |
if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then |
|
Lines 603-608
Link Here
|
| 603 |
localstatedir="${D}/var/lib" \ |
603 |
localstatedir="${D}/var/lib" \ |
| 604 |
mandir="${D}/usr/share/man" \ |
604 |
mandir="${D}/usr/share/man" \ |
| 605 |
sysconfdir="${D}/etc" \ |
605 |
sysconfdir="${D}/etc" \ |
|
|
606 |
${EI_DESTLIBDIR} \ |
| 606 |
${EXTRA_EINSTALL} \ |
607 |
${EXTRA_EINSTALL} \ |
| 607 |
"$@" install |
608 |
"$@" install |
| 608 |
fi |
609 |
fi |
|
Lines 612-617
Link Here
|
| 612 |
localstatedir="${D}/var/lib" \ |
613 |
localstatedir="${D}/var/lib" \ |
| 613 |
mandir="${D}/usr/share/man" \ |
614 |
mandir="${D}/usr/share/man" \ |
| 614 |
sysconfdir="${D}/etc" \ |
615 |
sysconfdir="${D}/etc" \ |
|
|
616 |
${EI_DESTLIBDIR} \ |
| 615 |
${EXTRA_EINSTALL} \ |
617 |
${EXTRA_EINSTALL} \ |
| 616 |
"$@" install || die "einstall failed" |
618 |
"$@" install || die "einstall failed" |
| 617 |
else |
619 |
else |
