aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-10-22 21:54:11 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-10-22 21:54:11 +0000
commitac7f54e9ebfc7d71202f9f2b88a0d482f2ded7f6 (patch)
treee7970a943db940663ca226c91bfa20e0361ab3da
parent8e4b4f521b7243c304fc4bd55dd336c09eebfc68 (diff)
downloadupstream-ac7f54e9ebfc7d71202f9f2b88a0d482f2ded7f6.tar.gz
upstream-ac7f54e9ebfc7d71202f9f2b88a0d482f2ded7f6.tar.bz2
upstream-ac7f54e9ebfc7d71202f9f2b88a0d482f2ded7f6.zip
proper error handling in package/Makefile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2264 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/Makefile22
1 files changed, 13 insertions, 9 deletions
diff --git a/package/Makefile b/package/Makefile
index 9053acb377..1bdbbbfd85 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -443,21 +443,25 @@ $(TARGET_DIR):
%-prepare: $(STAMP_DIR) $(TARGET_DIR)
@[ -f $(STAMP_DIR)/.$@ ] || { \
$(START_TRACE) "package/$(patsubst %-prepare,%,$@)/prepare: "; \
- $(MAKE) -C $(patsubst %-prepare,%,$@) prepare; \
- $(CMD_TRACE) " done"; \
- $(END_TRACE); \
+ $(MAKE) -C $(patsubst %-prepare,%,$@) prepare && { \
+ touch $(STAMP_DIR)/.$@; \
+ } || { \
+ $(CMD_TRACE) " done"; \
+ $(END_TRACE); \
+ } \
}
- @touch $(STAMP_DIR)/.$@
%-compile:
@[ -f $(STAMP_DIR)/.$@ ] || { \
$(START_TRACE) "package/$(patsubst %-compile,%,$@)/compile: "; \
- $(MAKE) -C $(patsubst %-compile,%,$@) compile; \
- $(CMD_TRACE) " done"; \
- $(END_TRACE); \
+ $(MAKE) -C $(patsubst %-compile,%,$@) compile && { \
+ touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare; \
+ touch $(STAMP_DIR)/.$@; \
+ } || { \
+ $(CMD_TRACE) " done"; \
+ $(END_TRACE); \
+ } \
}
- @touch $(STAMP_DIR)/.$(patsubst %-compile,%,$@)-prepare
- @touch $(STAMP_DIR)/.$@
%-install: %-compile
@$(START_TRACE) "package/$(patsubst %-install,%,$@)/install: "