[packages] This fixes some problems with commit r16438.

#5385 is fixed now

git-svn-id: svn://svn.openwrt.org/openwrt/packages@16522 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/ipv6/dhcp6/Makefile b/ipv6/dhcp6/Makefile
index 82c970c..056814a 100644 (file)
--- a/ipv6/dhcp6/Makefile
+++ b/ipv6/dhcp6/Makefile
@@ -15,11 +15,10 @@ PKG_SOURCE:=dhcpv6-linux-$(PKG_VERSION).zip
 PKG_SOURCE_URL:=@SF/dhcpv6-linux
 PKG_MD5SUM:=86193dfa62137db3ea459543db4f1102
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
-
 include $(INCLUDE_DIR)/package.mk
 
+PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
+
 define Package/dhcp6/Default
   SECTION:=ipv6
   CATEGORY:=IPv6

diff --git a/net/imsnif/Makefile b/net/imsnif/Makefile
index ef9b7d9..b877a42 100644 (file)
--- a/net/imsnif/Makefile
+++ b/net/imsnif/Makefile
@@ -13,10 +13,10 @@ PKG_MD5SUM:=689c456f8edb77b9b4199a25514ac683
 PKG_SOURCE_URL:=@SF/im-snif
 PKG_SOURCE:=$(PKG_NAME)f_$(PKG_VERSION).tgz
 
-PKG_UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) -xvf -
-
 include $(INCLUDE_DIR)/package.mk
 
+PKG_UNPACK:=gzip -dc $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) -xvf -
+
 define Package/imsnif
   SECTION:=net
   CATEGORY:=Network

diff --git a/utils/dt/Makefile b/utils/dt/Makefile
index b437cfb..168bbed 100644 (file)
--- a/utils/dt/Makefile
+++ b/utils/dt/Makefile
@@ -15,12 +15,12 @@ PKG_SOURCE:=$(PKG_NAME)-source.tar.gz
 PKG_SOURCE_URL:=http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/$(PKG_NAME)/
 PKG_MD5SUM:=5776233a2d301a50b314306538257a45
 
+include $(INCLUDE_DIR)/package.mk
+
 PKG_UNPACK= \
        zcat $(DL_DIR)/$(PKG_SOURCE) | \
                $(TAR) -C $(PKG_BUILD_DIR) --strip-components 2 $(TAR_OPTIONS);
 
-include $(INCLUDE_DIR)/package.mk
-
 define Package/dt
   CATEGORY:=Utilities
   SECTION:=utils

diff --git a/utils/microcom/Makefile b/utils/microcom/Makefile
index e1378ec..17c7e04 100644 (file)
--- a/utils/microcom/Makefile
+++ b/utils/microcom/Makefile
@@ -15,10 +15,10 @@ PKG_SOURCE:=m102.tar.gz
 PKG_SOURCE_URL:=http://microcom.port5.com/
 PKG_MD5SUM:=c7817035dc41cb02e7cfb565cf9b7401
 
-PKG_UNPACK:=zcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
-
 include $(INCLUDE_DIR)/package.mk
 
+PKG_UNPACK:=zcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+
 define Package/microcom
   SECTION:=utils
   CATEGORY:=Utilities

diff --git a/utils/unzip/Makefile b/utils/unzip/Makefile
index 165f3da..f012816 100644 (file)
--- a/utils/unzip/Makefile
+++ b/utils/unzip/Makefile
@@ -15,10 +15,10 @@ PKG_SOURCE:=$(PKG_NAME)552.zip
 PKG_SOURCE_URL:=@SF/infozip
 PKG_MD5SUM:=3d55b4e7375c3d0b81feca52dc0e4d48
 
-PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
-
 include $(INCLUDE_DIR)/package.mk
 
+PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
+
 define Package/unzip
   SECTION:=utils
   CATEGORY:=Utilities

diff --git a/utils/zip/Makefile b/utils/zip/Makefile
index dc2a881..d0b5df7 100644 (file)
--- a/utils/zip/Makefile
+++ b/utils/zip/Makefile
@@ -15,10 +15,10 @@ PKG_SOURCE:=$(PKG_NAME)232.zip
 PKG_SOURCE_URL:=@SF/infozip
 PKG_MD5SUM:=da947ed356e5fdb30ff4bc3dc7698f33
 
-PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
-
 include $(INCLUDE_DIR)/package.mk
 
+PKG_UNPACK=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
+
 define Package/zip
   SECTION:=utils
   CATEGORY:=Utilities