[gentoo-commits] proj/openrc:master commit in: mk/

["William Hubbs" <williamh@gentoo.org>]

commit:     8e4169e29e419bfd986455bb809463a3fa433afb
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Fri Aug 31 20:54:52 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 21:50:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8e4169e2

Fix UPREFIX for Gentoo Prefix installations

Make sure UPREFIX in our make files gets set correctly when
MKPREFIX=yes. In this situation, UPREFIX should be ${PREFIX}/usr.

Reported-by: <heroxdb <AT> gentoo.org>
X-Gentoo-Bug: 415899
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=415899

---
 mk/sys.mk |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mk/sys.mk b/mk/sys.mk
index efa478c..251287f 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -11,9 +11,14 @@ SED?=			sed
 SH=			/bin/sh
 
 PREFIX?=
-_UPREFIX_SH=		case "${PREFIX}" in "") echo /usr;; *) echo "${PREFIX}";; esac
-_UPREFIX:=		$(shell ${_UPREFIX_SH})
-UPREFIX=		${_UPREFIX}
+ifeq (${PREFIX},)
+UPREFIX= /usr
+else
+UPREFIX= ${PREFIX}
+ifeq (${MKPREFIX},yes)
+UPREFIX= ${PREFIX}/usr
+endif
+endif
 LOCAL_PREFIX=		/usr/local
 
 PICFLAG?=		-fPIC