diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-10-22 21:54:11 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-10-22 21:54:11 +0000 |
| commit | d65c4f7d8dfec13f4f572b98d60963acef1b9a9f (patch) | |
| tree | 5ccba5604f27c33ba72a1ef2bf1bd5cbf4c53811 | |
| parent | 3f7e469c04ed985684006c462ff94340b224c4d4 (diff) | |
proper error handling in package/Makefile
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2264 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | openwrt/package/Makefile | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 9053acb37..1bdbbbfd8 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: " |