aboutsummaryrefslogtreecommitdiffstats
path: root/package/popt/Makefile
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2005-03-30 22:16:06 +0000
committerNicolas Thill <nico@openwrt.org>2005-03-30 22:16:06 +0000
commit79812b5a5e03f065e92e0d854923d90423b90f49 (patch)
tree47d807b7af2efb593d8eecf00edaf8237bd0ad4f /package/popt/Makefile
parente66b0f1fa3b455b7e8f706291843baf9618b70c7 (diff)
downloadupstream-79812b5a5e03f065e92e0d854923d90423b90f49.tar.gz
upstream-79812b5a5e03f065e92e0d854923d90423b90f49.tar.bz2
upstream-79812b5a5e03f065e92e0d854923d90423b90f49.zip
Change popt packaging
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@486 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/popt/Makefile')
-rw-r--r--package/popt/Makefile20
1 files changed, 9 insertions, 11 deletions
diff --git a/package/popt/Makefile b/package/popt/Makefile
index 360a18c1d2..c84921ab80 100644
--- a/package/popt/Makefile
+++ b/package/popt/Makefile
@@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME := popt
PKG_VERSION := 1.7
-PKG_RELEASE := 3
+PKG_RELEASE := 4
PKG_MD5SUM := 5988e7aeb0ae4dac8d83561265984cc9
PKG_SOURCE_SITE := ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
@@ -21,16 +21,15 @@ $(DL_DIR)/$(PKG_SOURCE_FILE):
$(PKG_BUILD_DIR)/ipkg/rules: $(DL_DIR)/$(PKG_SOURCE_FILE)
mkdir -p $(TOOL_BUILD_DIR)
$(PKG_SOURCE_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- $(PATCH) $(PKG_BUILD_DIR) . $(PKG_NAME)-\*.diff
+# $(PATCH) $(PKG_BUILD_DIR) ./patches
+ cp -fpR ./ipkg $(PKG_BUILD_DIR)/
chmod a+x $(PKG_BUILD_DIR)/ipkg/rules
$(PKG_IPK): $(PKG_BUILD_DIR)/ipkg/rules
cd $(PKG_BUILD_DIR); \
- ipkg/rules \
- TOPDIR="$(TOPDIR)" \
- IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
- INSTALL_DIR="$(STAGING_DIR)" \
- package
+ TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+ INSTALL_DIR="$(STAGING_DIR)" \
+ ipkg/rules package
$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK)
$(IPKG) install $(PKG_IPK)
@@ -42,10 +41,9 @@ 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
+ TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+ INSTALL_DIR="$(STAGING_DIR)" \
+ ipkg/rules clean
rm -rf $(PKG_BUILD_DIR)
rm -r $(PKG_IPK)