summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-01-08 19:29:36 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2011-01-08 19:29:36 +0100
commit422beddb9dcf0a67afe92e70f3afef6baed6a4b0 (patch)
treee933f331d64e505bbc74228f32a888ef644f61a8 /mk
parenta06de804c0629a9091acc46c143fefd0f2641a80 (diff)
fix make clean target rule
correct the wrong path and remove the correct files on clean. Finetune more directory creation rules.
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk7
-rw-r--r--mk/buildhlp.mk1
2 files changed, 5 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 3384cc602..9f1841cc2 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -114,7 +114,8 @@ ${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config $(wildcard ${TOPDIR}/package/*/M
.PHONY: all world clean cleantarget cleandir distclean image_clean
world:
- mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps $(TOOLS_DIR) $(TOOLS_BUILD_DIR)
+ mkdir -p $(DISTDIR) $(BUILD_DIR) $(TARGET_DIR) $(PACKAGE_DIR)/.stamps \
+ $(TOOLS_DIR) $(TOOLS_BUILD_DIR) $(TOOLCHAIN_BUILD_DIR)
${BASH} ${TOPDIR}/scripts/scan-pkgs.sh
${BASH} ${TOPDIR}/scripts/update-sys
${BASH} ${TOPDIR}/scripts/update-pkg
@@ -200,7 +201,7 @@ root_clean:
mkdir -p $(TARGET_DIR)
# Do a per-package clean here, too. This way stale headers and
-# libraries from cross_*/target/ get wiped away, which keeps
+# libraries from target_*/ get wiped away, which keeps
# future package build's configure scripts from returning false
# dependencies information.
@@ -210,7 +211,7 @@ clean:
for d in ${STAGING_PKG_DIR}; do \
for f in $$(ls $$d/[a-z]* 2>/dev/null); do \
while read file ; do \
- rm $$d/target/$$file 2>/dev/null; \
+ rm ${STAGING_TARGET_DIR}/$$file 2>/dev/null;\
done < $$f ; \
rm $$f ; \
done \
diff --git a/mk/buildhlp.mk b/mk/buildhlp.mk
index 35d4eebd0..c7c598de3 100644
--- a/mk/buildhlp.mk
+++ b/mk/buildhlp.mk
@@ -25,6 +25,7 @@ _CHECKSUM_COOKIE=
endif
post-extract:
+ @mkdir -p ${PACKAGE_DIR}/.stamps
ifeq ($(strip ${NO_DISTFILES}),1)
${WRKDIST}/.extract_done: