fresh diffs for linux-mips (26.3 cvs) and ebtables (15.3)

[openwrt.git] / openwrt / package / popt / Makefile

diff --git a/openwrt/package/popt/Makefile b/openwrt/package/popt/Makefile
index ac05eb5..360a18c 100644 (file)
--- a/openwrt/package/popt/Makefile
+++ b/openwrt/package/popt/Makefile
@@ -1,8 +1,11 @@
+# $Id$
+

 include $(TOPDIR)/rules.mk
 
 PKG_NAME := popt
 PKG_VERSION := 1.7
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := popt
 PKG_VERSION := 1.7

-PKG_RELEASE := 2
+PKG_RELEASE := 3
+PKG_MD5SUM := 5988e7aeb0ae4dac8d83561265984cc9

 
 PKG_SOURCE_SITE := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_SITE := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -11,10 +14,9 @@ PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
 PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
 PKG_IPK := $(PACKAGE_DIR)/lib$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 

-

 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)
 $(DL_DIR)/$(PKG_SOURCE_FILE):
        mkdir -p $(DL_DIR)

-       $(WGET) -P $(DL_DIR) $(PKG_SOURCE_SITE)/$(PKG_SOURCE_FILE)
+       $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)

 
 $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(TOOL_BUILD_DIR)
 
 $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
        mkdir -p $(TOOL_BUILD_DIR)


@@ -39,8 +41,11 @@ compile: $(PKG_IPK)
 install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
 
 clean:
 install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
 
 clean:

+       -cd $(PKG_BUILD_DIR); \
+       ipkg/rules \
+         TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+         INSTALL_DIR="$(STAGING_DIR)" \
+        clean

        rm -rf $(PKG_BUILD_DIR)
        rm -rf $(PKG_BUILD_DIR)

-       rm -f $(STAGING_DIR)/usr/include/popt.h
-       rm -f $(STAGING_DIR)/usr/lib/libpopt\*
-       rm -f $(PACKAGE_DIR)/lib$(PKG_NAME)\*.ipk
+       rm -r $(PKG_IPK)