diff options
| author | Roy Marples <roy@marples.name> | 2008-01-10 16:48:02 +0000 |
|---|---|---|
| committer | Roy Marples <roy@marples.name> | 2008-01-10 16:48:02 +0000 |
| commit | 023270f76aca2a6bbf1ad1521b77259c68134587 (patch) | |
| tree | 74787b8439a46aafa509fe629883bba1a3ac1857 | |
| parent | 2857fb49d1b19b1677c58c2a34910699cfe5ebbb (diff) | |
| download | openrc-023270f76aca2a6bbf1ad1521b77259c68134587.tar.gz openrc-023270f76aca2a6bbf1ad1521b77259c68134587.tar.bz2 openrc-023270f76aca2a6bbf1ad1521b77259c68134587.tar.xz | |
Don't go into SUBOS if same as OS.
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | mk/subdir.mk | 2 |
2 files changed, 6 insertions, 5 deletions
@@ -8,12 +8,13 @@ PKG= ${NAME}-${VERSION} 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: ${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 diff --git a/mk/subdir.mk b/mk/subdir.mk index 9750235..d3074ca 100644 --- a/mk/subdir.mk +++ b/mk/subdir.mk @@ -19,7 +19,7 @@ _SUBDIR = @${_+_}for x in ${SUBDIR}; do \ DIRPRFX=${DIRPRFX}$$x.${OS}/ || exit $$?; \ cd ..; \ fi; \ - if test -d $$x.${SUBOS}; then \ + if test "${SUBOS}" != "${OS}" && test -d $$x.${SUBOS}; then \ ${ECHODIR} "===> ${DIRPRFX}$$x.${SUBOS} (${@:realinstall=install})"; \ cd $$x.${SUBOS}; \ ${MAKE} ${@:realinstall=install} \ |