diff --git a/mk/os-prefix.mk b/mk/os-prefix.mk index c546a862..af08c99e 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 20b43826..bac0388c 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 76f0b787..948ec1d4 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