From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-500528-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 2BBC0138010
	for <garchives@archives.gentoo.org>; Fri, 31 Aug 2012 21:58:11 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id EDC1DE062C;
	Fri, 31 Aug 2012 21:57:57 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id BF7BCE062C
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Aug 2012 21:57:57 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 3287433D949
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Aug 2012 21:57:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id E3F18E543C
	for <gentoo-commits@lists.gentoo.org>; Fri, 31 Aug 2012 21:57:54 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" <williamh@gentoo.org>
Message-ID: <1346449849.8e4169e29e419bfd986455bb809463a3fa433afb.WilliamH@OpenRC>
Subject: [gentoo-commits] proj/openrc:master commit in: mk/
X-VCS-Repository: proj/openrc
X-VCS-Files: mk/sys.mk
X-VCS-Directories: mk/
X-VCS-Committer: WilliamH
X-VCS-Committer-Name: William Hubbs
X-VCS-Revision: 8e4169e29e419bfd986455bb809463a3fa433afb
X-VCS-Branch: master
Date: Fri, 31 Aug 2012 21:57:54 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 3e5a77cd-c48f-492f-88ae-15126783a4e2
X-Archives-Hash: 4908c28c21b0eaf53caac04b183dc49d

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