Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 178544 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/lib64/portage/bin/ebuild.sh (-3 / +4 lines)
Lines 583-588 Link Here
583
583
584
einstall() {
584
einstall() {
585
	# CONF_PREFIX is only set if they didn't pass in libdir above.
585
	# CONF_PREFIX is only set if they didn't pass in libdir above.
586
	local LOCAL_EXTRA_EINSTALL="${EXTRA_EINSTALL}"
586
	LIBDIR_VAR="LIBDIR_${ABI}"
587
	LIBDIR_VAR="LIBDIR_${ABI}"
587
	if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
588
	if [ -n "${ABI}" -a -n "${!LIBDIR_VAR}" ]; then
588
		CONF_LIBDIR="${!LIBDIR_VAR}"
589
		CONF_LIBDIR="${!LIBDIR_VAR}"
Lines 591-597 Link Here
591
	if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
592
	if [ -n "${CONF_LIBDIR}" ] && [ "${CONF_PREFIX:-unset}" != "unset" ]; then
592
		EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}"
593
		EI_DESTLIBDIR="${D}/${CONF_PREFIX}/${CONF_LIBDIR}"
593
		EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})"
594
		EI_DESTLIBDIR="$(strip_duplicate_slashes ${EI_DESTLIBDIR})"
594
		EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${EXTRA_EINSTALL}"
595
		LOCAL_EXTRA_EINSTALL="libdir=${EI_DESTLIBDIR} ${LOCAL_EXTRA_EINSTALL}"
595
		unset EI_DESTLIBDIR
596
		unset EI_DESTLIBDIR
596
	fi
597
	fi
597
598
Lines 603-609 Link Here
603
				localstatedir="${D}/var/lib" \
604
				localstatedir="${D}/var/lib" \
604
				mandir="${D}/usr/share/man" \
605
				mandir="${D}/usr/share/man" \
605
				sysconfdir="${D}/etc" \
606
				sysconfdir="${D}/etc" \
606
				${EXTRA_EINSTALL} \
607
				${LOCAL_EXTRA_EINSTALL} \
607
				"$@" install
608
				"$@" install
608
		fi
609
		fi
609
		make prefix="${D}/usr" \
610
		make prefix="${D}/usr" \
Lines 612-618 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" \
615
			${EXTRA_EINSTALL} \
616
			${LOCAL_EXTRA_EINSTALL} \
616
			"$@" install || die "einstall failed"
617
			"$@" install || die "einstall failed"
617
	else
618
	else
618
		die "no Makefile found"
619
		die "no Makefile found"

Return to bug 178544