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

Collapse All | Expand All

(-)euse.orig (-6 / +6 lines)
Lines 201-213 get_all_make_defaults() { Link Here
201
	local parent
201
	local parent
202
	local rvalue
202
	local rvalue
203
203
204
	curdir="${1:-$(get_real_path ${MAKE_PROFILE_PATH})}"
204
	curdir="${1:-$(get_real_path "${MAKE_PROFILE_PATH}")}"
205
205
206
	[ -f "${curdir}/make.defaults" ] && rvalue="${curdir}/make.defaults ${rvalue}"
206
	[ -f "${curdir}/make.defaults" ] && rvalue="${curdir}/make.defaults ${rvalue}"
207
	if [ -f "${curdir}/parent" ]; then
207
	if [ -f "${curdir}/parent" ]; then
208
		for parent in $(egrep -v '(^#|^ *$)' ${curdir}/parent); do
208
		for parent in $(egrep -v '(^#|^ *$)' "${curdir}/parent"); do
209
			pdir="$(get_real_path ${curdir}/${parent})"
209
			pdir="$(get_real_path "${curdir}/${parent}")"
210
			rvalue="$(get_all_make_defaults ${pdir}) ${rvalue}"
210
			rvalue="$(get_all_make_defaults "${pdir}") ${rvalue}"
211
		done
211
		done
212
	fi
212
	fi
213
213
Lines 222-229 get_make_defaults() { Link Here
222
	curdir="${1:-$(get_real_path ${MAKE_PROFILE_PATH})}"
222
	curdir="${1:-$(get_real_path ${MAKE_PROFILE_PATH})}"
223
223
224
	if [ ! -f "${curdir}/make.defaults" -a -f "${curdir}/parent" ]; then
224
	if [ ! -f "${curdir}/make.defaults" -a -f "${curdir}/parent" ]; then
225
		for parent in $(egrep -v '(^#|^ *$)' ${curdir}/parent); do
225
		for parent in $(egrep -v '(^#|^ *$)' "${curdir}/parent"); do
226
			if [ -f "$(get_make_defaults ${curdir}/${parent})" ]; then
226
			if [ -f "$(get_make_defaults "${curdir}/${parent}")" ]; then
227
				curdir="${curdir}/${parent}"
227
				curdir="${curdir}/${parent}"
228
				break
228
				break
229
			fi
229
			fi

Return to bug 315037