Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 37782
Collapse All | Expand All

(-)/usr/lib/portage/bin/ebuild.sh.orig (+36 lines)
Lines 343-348 Link Here
343
}
343
}
344
344
345
einstall() {
345
einstall() {
346
	local ancient_install_style=true
347
	eval $(
348
		find -name Makefile 2>/dev/null |
349
		while read file ; do
350
			if fgrep -q DESTDIR "$file" ; then
351
				echo ancient_install_style=false
352
				break
353
			fi
354
		done
355
	)
356
	if $ancient_install_style ; then
357
		ewarn "*** Package is not compatible with DESTDIR einstall style."
358
		ewarn "*** Please use einstall_ancient() instead of einstall()."
359
		einstall_ancient "$@"
360
	else
361
# FIXME. Remove this line after finishing of tests.
362
		ewarn "*** Using DESTDIR einstall() style."
363
		einstall_destdir "$@"
364
	fi
365
}
366
367
# FIXME: This should be renamed in future to einstall()
368
einstall_destdir() {
369
	if [ -f ./Makefile ] ; then
370
		if [ ! -z "${PORTAGE_DEBUG}" ]; then
371
			make -n DESTDIR=${D} \
372
			    "$@" install
373
		fi
374
		make DESTDIR=${D} \
375
		    "$@" install || die "einstall failed" 
376
	else
377
		die "no Makefile found"
378
	fi
379
}
380
381
einstall_ancient() {
346
	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
382
	if [ -f ./[mM]akefile -o -f ./GNUmakefile ] ; then
347
		if [ ! -z "${PORTAGE_DEBUG}" ]; then
383
		if [ ! -z "${PORTAGE_DEBUG}" ]; then
348
			make -n prefix=${D}/usr \
384
			make -n prefix=${D}/usr \

Return to bug 37782