From 07540fb955825e1ecdb47b39c0e0c2186b17e790 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 15 Oct 2012 13:19:41 +0000
Subject: [PATCH] build: fix host build stampfile usage, fixes spurious errors
 with missing opkg host binary after deleting the staging dir

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33776 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 include/host-build.mk | 39 ++++++++++++++-------------------------
 1 file changed, 14 insertions(+), 25 deletions(-)

diff --git a/include/host-build.mk b/include/host-build.mk
index 60b7b9f91..320e74ee4 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -164,9 +164,17 @@ ifndef DUMP
 	touch $$@
 
   $(call Host/Exports,$(HOST_STAMP_BUILT))
-  ifdef Host/Install
-    host-install: $(if $(STAMP_BUILT),$(HOST_STAMP_BUILT),$(HOST_STAMP_INSTALLED))
-  endif
+  $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
+		$(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep))
+		$(call Host/Compile)
+		$(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep))
+		touch $$@
+
+  $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)
+		$(call Host/Install)
+		$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
+		mkdir -p $$(shell dirname $$@)
+		touch $$@
 
   ifndef STAMP_BUILT
     prepare: host-prepare
@@ -175,31 +183,12 @@ ifndef DUMP
     clean: host-clean
     update: host-update
     refresh: host-refresh
-
-    $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED)
-		$(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep))
-		$(call Host/Compile)
-		$(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep))
-		touch $$@
-
-    $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)
-		$(call Host/Install)
-		$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
-		mkdir -p $$(shell dirname $$@)
-		touch $$@
-  else
-    $(HOST_STAMP_BUILT): $(HOST_STAMP_CONFIGURED) $(if $(FORCE_HOST_INSTALL),FORCE)
-		$(foreach hook,$(Hooks/HostCompile/Pre),$(call $(hook))$(sep))
-		$(call Host/Compile)
-		$(foreach hook,$(Hooks/HostCompile/Post),$(call $(hook))$(sep))
-		$(call Host/Install)
-		$(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
-		touch $$@
   endif
+
   host-prepare: $(HOST_STAMP_PREPARED)
   host-configure: $(HOST_STAMP_CONFIGURED)
-  host-compile: $(HOST_STAMP_BUILT)
-  host-install:
+  host-compile: $(HOST_STAMP_BUILT) $(if $(STAMP_BUILT),$(HOST_STAMP_INSTALLED))
+  host-install: $(HOST_STAMP_INSTALLED)
   host-clean: FORCE
 	$(call Host/Clean)
 	$(call Host/Uninstall)