From d65c4f7d8dfec13f4f572b98d60963acef1b9a9f Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 22 Oct 2005 21:54:11 +0000
Subject: proper error handling in package/Makefile

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2264 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 openwrt/package/Makefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'openwrt')

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: "
-- 
cgit v1.2.3