add file type autodetection for the unpack command and nuke PKG_CAT:= in lots of...

[openwrt.git] / include / package.mk

diff --git a/include/package.mk b/include/package.mk
index 34ba9a2..44fe33a 100644 (file)
--- a/include/package.mk
+++ b/include/package.mk
@@ -7,6 +7,9 @@
 
 all: $(if $(DUMP),dumpinfo,compile)
 
+PKG_BUILD_DIR ?= $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR ?= $(PKG_BUILD_DIR)/ipkg-install
+
 include $(INCLUDE_DIR)/prereq.mk
 include $(INCLUDE_DIR)/host.mk
 include $(INCLUDE_DIR)/unpack.mk
@@ -21,8 +24,8 @@ define Build/DefaultTargets
     download: $(DL_DIR)/$(PKG_SOURCE)
 
     $(DL_DIR)/$(PKG_SOURCE):
-               mkdir -p $(DL_DIR)
-               $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
+       mkdir -p $(DL_DIR)
+       $(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(PKG_SOURCE)" "$(PKG_MD5SUM)" $(PKG_SOURCE_URL)
 
     $(PKG_BUILD_DIR)/.prepared: $(DL_DIR)/$(PKG_SOURCE)
   endif
@@ -55,12 +58,11 @@ define Build/DefaultTargets
       $(PKG_BUILD_DIR)/.built: package-rebuild
     endif
 
+    compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
     $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed: $(PKG_BUILD_DIR)/.built
        mkdir -p $(STAGING_DIR)/stampfiles
        $(Build/InstallDev)
        touch $$@
-       
-    compile: $(STAGING_DIR)/stampfiles/.$(PKG_NAME)-installed
   endif
 
   package-rebuild: FORCE
@@ -74,7 +76,7 @@ define BuildPackage
   $(eval $(Package/Default))
   $(eval $(Package/$(1)))
 
-# <HACK> Support obsolete DESCRIPTION field>
+# <HACK> Support obsolete DESCRIPTION field
 ifndef Package/$(1)/description
 define Package/$(1)/description
 $(TITLE)$(subst \,