X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=include%2Fprereq.mk;h=8a08be8e68c9f4d34b0b8085c99ab01602bd21f5;hb=456a5100adde39506a7f18e62a46aafe2332dc1a;hp=eda7ca35a6977dfae118b0247bf932fc53ded404;hpb=f52d66ff00b24111f87c274d3d7085ef2e1d27b1;p=openwrt-10.03%2F.git diff --git a/include/prereq.mk b/include/prereq.mk index eda7ca35a..8a08be8e6 100644 --- a/include/prereq.mk +++ b/include/prereq.mk @@ -5,34 +5,29 @@ # See /LICENSE for more information. # -$(TMP_DIR): - mkdir -p $@ - prereq: if [ -f $(TMP_DIR)/.prereq-error ]; then \ echo; \ cat $(TMP_DIR)/.prereq-error; \ + rm -f $(TMP_DIR)/.prereq-error; \ echo; \ - rm -rf $(TMP_DIR); \ false; \ fi - rm -rf $(TMP_DIR) - mkdir -p $(TMP_DIR) -.SILENT: $(TMP_DIR) prereq +.SILENT: prereq define Require export PREREQ_CHECK=1 ifeq ($$(CHECK_$(1)),) prereq: prereq-$(1) - prereq-$(1): $(TMP_DIR) FORCE + prereq-$(1): FORCE echo -n "Checking '$(1)'... " if $(NO_TRACE_MAKE) -f $(firstword $(MAKEFILE_LIST)) check-$(1) >/dev/null 2>/dev/null; then \ echo 'ok.'; \ else \ echo 'failed.'; \ - echo -e "$(strip $(2))" >> $(TMP_DIR)/.prereq-error; \ + echo -e "$(PKG_NAME): $(strip $(2))" | perl -ne 's/\\\s*/\n/g,print' >> $(TMP_DIR)/.prereq-error; \ fi check-$(1): FORCE