remove msdos from vfat module, add ext2, ext3, xfs, hfsplus

[openwrt.git] / package / popt / Makefile

diff --git a/package/popt/Makefile b/package/popt/Makefile
index c84921a..db3a9b1 100644 (file)
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -7,7 +7,8 @@ PKG_VERSION := 1.7
 PKG_RELEASE := 4
 PKG_MD5SUM := 5988e7aeb0ae4dac8d83561265984cc9
 
-PKG_SOURCE_SITE := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
+PKG_SOURCE_SITE := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \
+       http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_CAT := zcat
 PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
@@ -24,12 +25,13 @@ $(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
 #      $(PATCH) $(PKG_BUILD_DIR) ./patches
        cp -fpR ./ipkg $(PKG_BUILD_DIR)/
        chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
+       touch $(PKG_BUILD_DIR)/ipkg/rules
 
 $(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
        cd $(PKG_BUILD_DIR); \
        TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
        INSTALL_DIR="$(STAGING_DIR)" \
-       ipkg/rules package
+       ./ipkg/rules package
 
 $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK)
        $(IPKG) install $(PKG_IPK)
@@ -43,7 +45,7 @@ clean:
        -cd $(PKG_BUILD_DIR); \
        TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
        INSTALL_DIR="$(STAGING_DIR)" \
-       ipkg/rules clean
+       ./ipkg/rules clean
        rm -rf $(PKG_BUILD_DIR)
        rm -r $(PKG_IPK)