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

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

commit:     5af5d12f3e56f9f2ff232d124d27c856fd66f551
Author:     Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 13 22:43:36 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jun 13 22:43:36 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5af5d12f

Fix PATH for Prefix.

1. remove default /bin:/sbin:/usr/bin:/usr/sbin
2. PKG_PREFIX should be defaulted to $(PREFIX)/usr
3. LOCAL_PREFIX should be defaulted to $(PREFIX)/usr/local

X-Gentoo-Bug:583634
X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=583634

 mk/os-prefix.mk | 2 ++
 mk/os.mk        | 2 +-
 mk/sys.mk       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mk/os-prefix.mk b/mk/os-prefix.mk
index c546a86..af08c99 100644
--- a/mk/os-prefix.mk
+++ b/mk/os-prefix.mk
@@ -3,4 +3,6 @@
 
 ifeq (${MKPREFIX},yes)
 CPPFLAGS+=	-DPREFIX
+PKG_PREFIX?=	$(PREFIX)/usr
+SED_EXTRA=	-e '/_PATH=.*usr.bin/d'
 endif

diff --git a/mk/os.mk b/mk/os.mk
index 20b4382..bac0388 100644
--- a/mk/os.mk
+++ b/mk/os.mk
@@ -13,7 +13,7 @@
 _OS_SH=		uname -s | tr '/' '-'
 _OS:= 		$(shell ${_OS_SH})
 OS?= 		${_OS}
-include ${MK}/os-${OS}.mk
 include ${MK}/os-prefix.mk
+include ${MK}/os-${OS}.mk
 
 RC_LIB=		/$(LIBNAME)/rc

diff --git a/mk/sys.mk b/mk/sys.mk
index 76f0b78..948ec1d 100644
--- a/mk/sys.mk
+++ b/mk/sys.mk
@@ -26,7 +26,7 @@ ifeq (${MKPREFIX},yes)
 UPREFIX= ${PREFIX}/usr
 endif
 endif
-LOCAL_PREFIX=		/usr/local
+LOCAL_PREFIX=		$(UPREFIX)/local
 
 PICFLAG?=		-fPIC