sync with trunk.

[openwrt.git] / package / rules.mk

diff --git a/package/rules.mk b/package/rules.mk
index 2d37900..99e4a84 100644 (file)
--- a/package/rules.mk
+++ b/package/rules.mk
@@ -5,12 +5,14 @@ else
 endif
 
 define Build/DefaultTargets
-  ifeq ($(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) .),.)
-    $(PKG_BUILD_DIR)/.prepared: package-clean
-  endif
+  ifeq ($(DUMP),)
+    ifeq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p $(PKG_BUILD_DIR) . | tee /tmp/xy1),.)
+      $(PKG_BUILD_DIR)/.prepared: package-clean
+    endif
 
-  ifneq ($(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR)),$(IPKG_$(1)))
-    $(PKG_BUILD_DIR)/.built: package-rebuild
+    ifneq ($$(shell $(SCRIPT_DIR)/timestamp.pl -p -x ipkg $(IPKG_$(1)) $(PKG_BUILD_DIR) | tee /tmp/xy2),$(IPKG_$(1)))
+      $(PKG_BUILD_DIR)/.built: package-rebuild
+    endif
   endif
 
   $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
@@ -114,6 +116,12 @@ define BuildPackage
   DUMPINFO += \
        echo "@@";
 
+  ifneq ($(CONFIG),)
+    DUMPINFO += \
+       echo "Config: $(CONFIG)" | sed -e 's,\\,\n,g'; \
+       echo "@@";
+  endif
+
   $$(IDIR_$(1))/CONTROL/control: $(PKG_BUILD_DIR)/.prepared
        mkdir -p $$(IDIR_$(1))/CONTROL
        echo "Package: $(1)" > $$(IDIR_$(1))/CONTROL/control
@@ -191,6 +199,7 @@ define Build/Configure/Default
                --infodir=/usr/info \
                $(DISABLE_NLS) \
                $(1); \
+               true; \
        )
 endef
 
@@ -205,11 +214,12 @@ define Build/Compile/Default
                PREFIX="$$(IDIR_$(1))" \
                EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
                ARCH="$(ARCH)" \
-               DESTDIR="$$(IDIR_$(1))"
+               DESTDIR="$$(IDIR_$(1))" \
+               $(1);
 endef
 
 define Build/Compile
-  $(call Build/Compile/Default)
+  $(call Build/Compile/Default,)
 endef
 
 define Build/Clean
@@ -217,8 +227,8 @@ define Build/Clean
 endef
 
 ifneq ($(DUMP),)
-  dumpinfo:
-       $(DUMPINFO)
+  dumpinfo: FORCE
+       @$(DUMPINFO)
 else
                
   $(PACKAGE_DIR):
@@ -239,6 +249,3 @@ else
        @$(MAKE) clean-targets
        rm -rf $(PKG_BUILD_DIR)
 endif
-
-.PHONY: FORCE
-FORCE: