Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: mk/
Date: Fri, 31 Aug 2012 21:58:11
Message-Id: 1346449849.8e4169e29e419bfd986455bb809463a3fa433afb.WilliamH@OpenRC
1 commit: 8e4169e29e419bfd986455bb809463a3fa433afb
2 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
3 AuthorDate: Fri Aug 31 20:54:52 2012 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Fri Aug 31 21:50:49 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8e4169e2
7
8 Fix UPREFIX for Gentoo Prefix installations
9
10 Make sure UPREFIX in our make files gets set correctly when
11 MKPREFIX=yes. In this situation, UPREFIX should be ${PREFIX}/usr.
12
13 Reported-by: <heroxdb <AT> gentoo.org>
14 X-Gentoo-Bug: 415899
15 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=415899
16
17 ---
18 mk/sys.mk | 11 ++++++++---
19 1 files changed, 8 insertions(+), 3 deletions(-)
20
21 diff --git a/mk/sys.mk b/mk/sys.mk
22 index efa478c..251287f 100644
23 --- a/mk/sys.mk
24 +++ b/mk/sys.mk
25 @@ -11,9 +11,14 @@ SED?= sed
26 SH= /bin/sh
27
28 PREFIX?=
29 -_UPREFIX_SH= case "${PREFIX}" in "") echo /usr;; *) echo "${PREFIX}";; esac
30 -_UPREFIX:= $(shell ${_UPREFIX_SH})
31 -UPREFIX= ${_UPREFIX}
32 +ifeq (${PREFIX},)
33 +UPREFIX= /usr
34 +else
35 +UPREFIX= ${PREFIX}
36 +ifeq (${MKPREFIX},yes)
37 +UPREFIX= ${PREFIX}/usr
38 +endif
39 +endif
40 LOCAL_PREFIX= /usr/local
41
42 PICFLAG?= -fPIC