emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PATH for Prefix.

Browse Source 
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
This commit is contained in:
Benda Xu 2016-06-13 17:43:36 -05:00 committed by William Hubbs
parent b2c92b88cc
commit 5af5d12f3e
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mk/os-prefix.mk
View File

@ -3,4 +3,6 @@
ifeq (${MKPREFIX},yes) ifeq (${MKPREFIX},yes)
CPPFLAGS+= -DPREFIX CPPFLAGS+= -DPREFIX
PKG_PREFIX?= $(PREFIX)/usr
SED_EXTRA= -e '/_PATH=.*usr.bin/d'
endif endif

2
mk/os.mk
View File

@ -13,7 +13,7 @@
_OS_SH= uname -s | tr '/' '-' _OS_SH= uname -s | tr '/' '-'
_OS:= $(shell ${_OS_SH}) _OS:= $(shell ${_OS_SH})
OS?= ${_OS} OS?= ${_OS}
include ${MK}/os-${OS}.mk
include ${MK}/os-prefix.mk include ${MK}/os-prefix.mk
include ${MK}/os-${OS}.mk
RC_LIB= /$(LIBNAME)/rc RC_LIB= /$(LIBNAME)/rc

2
mk/sys.mk
View File

@ -26,7 +26,7 @@ ifeq (${MKPREFIX},yes)
UPREFIX= ${PREFIX}/usr UPREFIX= ${PREFIX}/usr
endif endif
endif endif
LOCAL_PREFIX= /usr/local LOCAL_PREFIX= $(UPREFIX)/local
PICFLAG?= -fPIC PICFLAG?= -fPIC