From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 22 Oct 2005 21:54:11 +0000 (+0000)
Subject: proper error handling in package/Makefile
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=98cfb582004ccac65f9e42ac4e89d430bd9dd763;p=openwrt%2Fstaging%2Fluka.git

proper error handling in package/Makefile

SVN-Revision: 2264
---

diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 9053acb377..1bdbbbfd85 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/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: "