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

Collapse All | Expand All

(-)old.ebuild.sh (-2 / +32 lines)
Lines 428-434 Link Here
428
		
428
		
429
		# if the profile defines a location to install libs to aside from default, pass it on.
429
		# if the profile defines a location to install libs to aside from default, pass it on.
430
		if [ ! -z "${CONF_LIBDIR}" ]; then
430
		if [ ! -z "${CONF_LIBDIR}" ]; then
431
			EXTRA_ECONF="--libdir=/usr/${CONF_LIBDIR} ${EXTRA_ECONF}"
431
			# an ebuild might specify a prefix other than the
432
			# default /usr, so we need to find it and use it if set.
433
			do_conf_libdir_prefix() {
434
			  if test $# -eq 0; then
435
			    CONF_LIBDIR_PREFIX="usr"
436
			  fi
437
			  while test $# -gt 0; do
438
			    case "$1" in
439
			    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
440
			    *) optarg= ;;
441
			    esac
442
			    case $1 in
443
			      --prefix=*)
444
			        CONF_LIBDIR_PREFIX="$optarg"
445
				;;
446
			      --prefix)
447
			        CONF_LIBDIR_PREFIX="$2"
448
				shift
449
				;;
450
			      *) : ;;
451
			    esac
452
			    shift
453
			  done
454
			  CONF_LIBDIR_PREFIX=${CONF_LIBDIR_PREFIX:=usr}
455
			  # this var will need to later be used by einstall
456
			  export CONF_LIBDIR_PREFIX
457
			}
458
459
			[ -z "${CONF_LIBDIR_PREFIX}" ] && do_conf_libdir_prefix "$@"
460
			EXTRA_ECONF="--libdir=/${CONF_LIBDIR_PREFIX}/${CONF_LIBDIR} ${EXTRA_ECONF}"
432
		fi
461
		fi
433
		
462
		
434
		echo ./configure \
463
		echo ./configure \
Lines 459-465 Link Here
459
488
460
einstall() {
489
einstall() {
461
	if [ ! -z "${CONF_LIBDIR}" ]; then
490
	if [ ! -z "${CONF_LIBDIR}" ]; then
462
		EXTRA_EINSTALL="libdir=${D}/usr/${CONF_LIBDIR} ${EXTRA_EINSTALL}"
491
		CONF_LIBDIR_PREFIX=${CONF_LIBDIR_PREFIX:=usr}
492
		EXTRA_EINSTALL="libdir=${D}/${CONF_LIBDIR_PREFIX}/${CONF_LIBDIR} ${EXTRA_EINSTALL}"
463
	fi
493
	fi
464
	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
494
	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
465
		if [ ! -z "${PORTAGE_DEBUG}" ]; then
495
		if [ ! -z "${PORTAGE_DEBUG}" ]; then

Return to bug 61060