X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/0a0554bc0f3e1c65cf0910ffc6dd2dccf4c6c699..12c49b6a6adbbcb0c7a19119c8a8c94b5f025f79:/package/Makefile

diff --git a/package/Makefile b/package/Makefile
index 0d74c0d7f..38b650c09 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -15,34 +15,40 @@ $(curdir)/builddirs-prereq:=. $(sort $(prereq-y) $(prereq-m))
 $(curdir)/builddirs-install:=. $(sort $(package-y))
 
 $(curdir)/install:=$(curdir)/install-cleanup
-$(curdir)/install-cleanup:
-	rm -rf $(BUILD_DIR)/root
-	$(MAKE) install-targets
-	$(MAKE) preconfig
+
+$(curdir)/cleanup: $(TMP_DIR)/.build
+	rm -rf $(TARGET_DIR)
+
+$(curdir)/rootfs-prepare: $(TMP_DIR)/.build
 	@if [ -d $(TOPDIR)/files ]; then \
-		$(CP) $(TOPDIR)/files/. $(BUILD_DIR)/root; \
+		$(CP) $(TOPDIR)/files/. $(TARGET_DIR); \
 	fi
-	@mkdir -p $(BUILD_DIR)/root/etc/rc.d
+	@mkdir -p $(TARGET_DIR)/etc/rc.d
 	@( \
-		cd $(BUILD_DIR)/root; \
+		cd $(TARGET_DIR); \
 		for script in ./etc/init.d/*; do \
 			grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \
-			IPKG_INSTROOT=$(BUILD_DIR)/root $(which bash) ./etc/rc.common $$script enable; \
+			IPKG_INSTROOT=$(TARGET_DIR) $(which bash) ./etc/rc.common $$script enable; \
 		done || true \
 	)
-	@-find $(BUILD_DIR)/root -name CVS   | $(XARGS) rm -rf
-	@-find $(BUILD_DIR)/root -name .svn  | $(XARGS) rm -rf
-	@-find $(BUILD_DIR)/root -name '.#*' | $(XARGS) rm -f
+	@-find $(TARGET_DIR) -name CVS   | $(XARGS) rm -rf
+	@-find $(TARGET_DIR) -name .svn  | $(XARGS) rm -rf
+	@-find $(TARGET_DIR) -name '.#*' | $(XARGS) rm -f
 
 $(curdir)/index: FORCE
-	(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
+	@(cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages)
 
 $(curdir)/flags-install:= -j1
 
 $(eval $(call stampfile,$(curdir),package,prereq))
+$(eval $(call stampfile,$(curdir),package,cleanup))
 $(eval $(call stampfile,$(curdir),package,compile))
 $(eval $(call stampfile,$(curdir),package,install))
+$(eval $(call stampfile,$(curdir),package,rootfs-prepare))
 
-$($(curdir)/stamp-install): $($(curdir)/stamp-compile)
+$($(curdir)/stamp-cleanup): $(TMP_DIR)/.build
+$($(curdir)/stamp-compile): $($(curdir)/stamp-cleanup) $(TMP_DIR)/.build
+$($(curdir)/stamp-install): $($(curdir)/stamp-compile) $(TMP_DIR)/.build
+$($(curdir)/stamp-rootfs-prepare): $($(curdir)/stamp-install) $(TMP_DIR)/.build
 
 $(eval $(call subdir,$(curdir)))