aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile9
-rw-r--r--mk/subdir.mk2
2 files changed, 6 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index f02c97ea..0f8726f9 100644
--- a/Makefile
+++ b/Makefile
@@ -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 97502353..d3074ca1 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} \