X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=include%2Fpackage-ipkg.mk;h=597f5f87c350b5cd6d2f2b757affcd724fe10533;hb=63d2eb1a7953be7ec5c786526d2efbbc2c56297c;hp=b71fce42a8fccb2601b5dcab3c0789f45f20dcef;hpb=2a19321d82afb24753a1f791c54bb31d698fdbdb;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
index b71fce42a8..597f5f87c3 100644
--- a/include/package-ipkg.mk
+++ b/include/package-ipkg.mk
@@ -17,20 +17,12 @@ ifeq ($(DUMP),)
     INFO_$(1):=$(IPKG_STATE_DIR)/info/$(1).list
 
     ifdef Package/$(1)/install
-      ifneq ($(CONFIG_PACKAGE_$(1)),)
+      ifneq ($(CONFIG_PACKAGE_$(1))$(SDK)$(DEVELOPER),)
         compile: $$(IPKG_$(1))
 
         ifeq ($(CONFIG_PACKAGE_$(1)),y)
           install: $$(INFO_$(1))
         endif
-
-        ifneq ($(MAKECMDGOALS),prereq)
-          ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg -x ipkg-install '$$(IPKG_$(1))' '$(PKG_BUILD_DIR)'),$$(IPKG_$(1)))
-            $(PKG_BUILD_DIR)/.built: package-rebuild
-            $$(info Rebuilding $(subst $(TOPDIR)/,,$$(IPKG_$(1))))
-          endif
-        endif
-
       else
         compile: $(1)-disabled
         $(1)-disabled:
@@ -71,9 +63,9 @@ ifeq ($(DUMP),)
     $$(IPKG_$(1)): $(PKG_BUILD_DIR)/.built $$(IDIR_$(1))/CONTROL/control
 	$(call Package/$(1)/install,$$(IDIR_$(1)))
 	mkdir -p $(PACKAGE_DIR)
-	-find $$(IDIR_$(1)) -name CVS   | xargs rm -rf
-	-find $$(IDIR_$(1)) -name .svn  | xargs rm -rf
-	-find $$(IDIR_$(1)) -name '.#*' | xargs rm -f
+	-find $$(IDIR_$(1)) -name CVS   | $(XARGS) rm -rf
+	-find $$(IDIR_$(1)) -name .svn  | $(XARGS) rm -rf
+	-find $$(IDIR_$(1)) -name '.#*' | $(XARGS) rm -f
 	$(RSTRIP) $$(IDIR_$(1))
 	$(IPKG_BUILD) $$(IDIR_$(1)) $(PACKAGE_DIR)
 	@[ -f $$(IPKG_$(1)) ] || false 
@@ -86,7 +78,7 @@ ifeq ($(DUMP),)
 
     clean: $(1)-clean
 
-    $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(PKG_BUILD_DIR)/.prepared
+    $(PKG_BUILD_DIR)/.version-$(1)_$(VERSION)_$(PKGARCH): $(STAMP_PREPARED)
 	-@rm -f $(PKG_BUILD_DIR)/.version-$(1)_* 2>/dev/null
 	@touch $$@