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

Fix installing into PREFIX.

Browse Source
This commit is contained in:
Roy Marples
2008-03-01 22:12:33 +00:00
parent 924ae8cadd
commit a135d0d93b
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -17,5 +17,5 @@ include ${MK}/subdir.mk
include ${MK}/dist.mk include ${MK}/dist.mk
_installafter: _installafter:
${INSTALL} -d ${DESTDIR}${RC_LIB}/init.d ${INSTALL} -d ${DESTDIR}/${PREFIX}/${RC_LIB}/init.d
${INSTALL} -d ${DESTDIR}${RC_LIB}/tmp ${INSTALL} -d ${DESTDIR}/${PREFIX}/${RC_LIB}/tmp

13
mk/sys.mk
View File

@@ -7,7 +7,10 @@ INSTALL?= install
RANLIB?= ranlib RANLIB?= ranlib
SH= /bin/sh SH= /bin/sh
PREFIX= PREFIX?=
_UPREFIX_SH= case "${PREFIX}" in "") echo /usr;; *) echo "${PREFIX}";; esac
_UPREFIX!= ${_UPREFIX_SH}
UPREFIX= ${_UPREFIX}$(shell ${_UPREFIX_SH})
PKG_PREFIX= /usr/local PKG_PREFIX= /usr/local
PICFLAG?= -fPIC PICFLAG?= -fPIC
@@ -15,18 +18,18 @@ PICFLAG?= -fPIC
BINDIR?= ${PREFIX}/sbin BINDIR?= ${PREFIX}/sbin
BINMODE?= 0755 BINMODE?= 0755
INCDIR?= ${PREFIX}/usr/include INCDIR?= ${UPREFIX}/include
INCMODE?= 0444 INCMODE?= 0444
LIBNAME?= lib LIBNAME?= lib
LIBDIR?= ${PREFIX}/usr/${LIBNAME} LIBDIR?= ${UPREFIX}/${LIBNAME}
LIBMODE?= 0444 LIBMODE?= 0444
SHLIBDIR?= ${PREFIX}/${LIBNAME} SHLIBDIR?= ${PREFIX}/${LIBNAME}
MANDIR?= ${PREFIX}/usr/share/man/man MANDIR?= ${UPREFIX}/share/man/man
MANMODE?= 0444 MANMODE?= 0444
DOCDIR?= ${PREFIX}/usr/share/doc DOCDIR?= ${UPREFIX}/share/doc
DOCMODE?= 0644 DOCMODE?= 0644
CONFMODE?= 0644 CONFMODE?= 0644

2
runlevels/Makefile
View File

@@ -2,7 +2,7 @@ BOOT= bootmisc fsck hostname localmount \
root swap sysctl urandom root swap sysctl urandom
DEFAULT= local netmount DEFAULT= local netmount
LEVELDIR= ${DESTDIR}/etc/runlevels LEVELDIR= ${DESTDIR}/${PREFIX}/etc/runlevels
BOOTDIR= ${LEVELDIR}/boot BOOTDIR= ${LEVELDIR}/boot
DEFAULTDIR= ${LEVELDIR}/default DEFAULTDIR= ${LEVELDIR}/default

2
sh/Makefile
View File

@@ -11,7 +11,7 @@ include Makefile.${SUBOS}
include ${MK}/scripts.mk include ${MK}/scripts.mk
_installafter: _installafter:
${INSTALL} -d ${DESTDIR}/etc/init.d ${INSTALL} -d ${DESTDIR}/${PREFIX}/etc/init.d
@# Provide an init script for the loopback interface @# Provide an init script for the loopback interface
ln -snf ${RC_LIB}/sh/net.sh ${DESTDIR}/${PREFIX}/etc/init.d/${NET_LO} || exit $$? ln -snf ${RC_LIB}/sh/net.sh ${DESTDIR}/${PREFIX}/etc/init.d/${NET_LO} || exit $$?
@# Put functions.sh into the init.d dir so 3rd party apps don't have to @# Put functions.sh into the init.d dir so 3rd party apps don't have to