diff options
| author | Roy Marples <roy@marples.name> | 2008-01-10 16:57:05 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-10 16:57:05 +0000 |
| commit | 6ca21b4c6a129ae563b39e6fa60ba005b5dd9aa6 (patch) | |
| tree | 1fba7fc22d151641f4d188f820eac094151fca79 | |
| parent | 13f64ccc9480bf583558fae4fce64813d7f5dd50 (diff) | |
More make fixes
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | sh/Makefile | 7 |
2 files changed, 9 insertions, 5 deletions
@@ -11,11 +11,12 @@ SUBDIR= conf.d doc etc init.d man net runlevels sh src INSTALL?= install INSTALLAFTER= _installafter -_installafter: - ${INSTALL} -d ${DESTDIR}${RC_LIB}/init.d - ${INSTALL} -d ${DESTDIR}${RC_LIB}/tmp MK= mk include ${MK}/os.mk include ${MK}/subdir.mk include ${MK}/dist.mk + +_installafter: + ${INSTALL} -d ${DESTDIR}${RC_LIB}/init.d + ${INSTALL} -d ${DESTDIR}${RC_LIB}/tmp diff --git a/sh/Makefile b/sh/Makefile index ff4d31b2..6ee88013 100644 --- a/sh/Makefile +++ b/sh/Makefile @@ -4,11 +4,14 @@ BIN= gendepends.sh net.sh runscript.sh MK= ../mk +INSTALLAFTER= _installafter + # To get NET_LO include ${MK}/os.mk include Makefile.${SUBOS} -INSTALLAFTER= _installafter +include ${MK}/scripts.mk + _installafter: @# Handle lib correctly 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 $$?; \ rm -f ${DESTDIR}/${RC_LIB}/sh/rc-functions.sh.bak; \ fi + ${INSTALL} -d ${DESTDIR}/etc/init.d @# Provide an init script for the loopback interface 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 @# be multilib aware ln -snf ${RC_LIB}/sh/functions.sh ${DESTDIR}/etc/init.d || exit $$? -include ${MK}/scripts.mk |