Don't go into SUBOS if same as OS.

This commit is contained in:
Roy Marples 2008-01-10 16:48:02 +00:00
parent 2857fb49d1
commit 023270f76a
2 changed files with 6 additions and 5 deletions

View File

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

View File

@ -19,7 +19,7 @@ _SUBDIR = @${_+_}for x in ${SUBDIR}; do \
DIRPRFX=${DIRPRFX}$$x.${OS}/ || exit $$?; \ DIRPRFX=${DIRPRFX}$$x.${OS}/ || exit $$?; \
cd ..; \ cd ..; \
fi; \ fi; \
if test -d $$x.${SUBOS}; then \ if test "${SUBOS}" != "${OS}" && test -d $$x.${SUBOS}; then \
${ECHODIR} "===> ${DIRPRFX}$$x.${SUBOS} (${@:realinstall=install})"; \ ${ECHODIR} "===> ${DIRPRFX}$$x.${SUBOS} (${@:realinstall=install})"; \
cd $$x.${SUBOS}; \ cd $$x.${SUBOS}; \
${MAKE} ${@:realinstall=install} \ ${MAKE} ${@:realinstall=install} \