More make fixes

This commit is contained in:
Roy Marples 2008-01-10 16:57:05 +00:00
parent 13f64ccc94
commit 6ca21b4c6a
2 changed files with 9 additions and 5 deletions

View File

@ -11,11 +11,12 @@ SUBDIR= conf.d doc etc init.d man net runlevels sh src
INSTALL?= install INSTALL?= install
INSTALLAFTER= _installafter INSTALLAFTER= _installafter
_installafter:
${INSTALL} -d ${DESTDIR}${RC_LIB}/init.d
${INSTALL} -d ${DESTDIR}${RC_LIB}/tmp
MK= mk MK= mk
include ${MK}/os.mk include ${MK}/os.mk
include ${MK}/subdir.mk include ${MK}/subdir.mk
include ${MK}/dist.mk include ${MK}/dist.mk
_installafter:
${INSTALL} -d ${DESTDIR}${RC_LIB}/init.d
${INSTALL} -d ${DESTDIR}${RC_LIB}/tmp

View File

@ -4,11 +4,14 @@ BIN= gendepends.sh net.sh runscript.sh
MK= ../mk MK= ../mk
INSTALLAFTER= _installafter
# To get NET_LO # To get NET_LO
include ${MK}/os.mk include ${MK}/os.mk
include Makefile.${SUBOS} include Makefile.${SUBOS}
INSTALLAFTER= _installafter include ${MK}/scripts.mk
_installafter: _installafter:
@# Handle lib correctly @# Handle lib correctly
if test ${LIBNAME} != "lib"; then \ if test ${LIBNAME} != "lib"; then \
@ -17,10 +20,10 @@ _installafter:
sed -i'.bak' -e 's,/lib/,/${LIBNAME}/,g' ${DESTDIR}/${RC_LIB}/sh/rc-functions.sh || exit $$?; \ sed -i'.bak' -e 's,/lib/,/${LIBNAME}/,g' ${DESTDIR}/${RC_LIB}/sh/rc-functions.sh || exit $$?; \
rm -f ${DESTDIR}/${RC_LIB}/sh/rc-functions.sh.bak; \ rm -f ${DESTDIR}/${RC_LIB}/sh/rc-functions.sh.bak; \
fi fi
${INSTALL} -d ${DESTDIR}/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}/etc/init.d/${NET_LO} || exit $$? ln -snf ${RC_LIB}/sh/net.sh ${DESTDIR}/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
@# be multilib aware @# be multilib aware
ln -snf ${RC_LIB}/sh/functions.sh ${DESTDIR}/etc/init.d || exit $$? ln -snf ${RC_LIB}/sh/functions.sh ${DESTDIR}/etc/init.d || exit $$?
include ${MK}/scripts.mk