From cb83593bbe260bfdbc705d2eb6e1d5f8ba5dd7fb Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 30 Mar 2005 22:35:14 +0000
Subject: Change dhcp-forwarder packaging

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@488 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/dhcp-forwarder/Makefile | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'package/dhcp-forwarder/Makefile')

diff --git a/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index bfedfa4c5e..4f35086107 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/package/dhcp-forwarder/Makefile
@@ -7,12 +7,13 @@ PKG_VERSION := 0.7
 PKG_RELEASE := 4
 PKG_MD5SUM := e7f876e615ebc3f96418f6477b4451e2
 
-PKG_SOURCE_SITE := http://savannah.nongnu.org/download/dhcp-fwd/
+PKG_SOURCE_SITE := http://savannah.nongnu.org/download/dhcp-fwd/ \
+	http://nthill.free.fr/openwrt/sources/$(PKG_NAME)/
 PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_CAT := bzcat
 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_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
 
 $(DL_DIR)/$(PKG_SOURCE_FILE):
 	mkdir -p $(DL_DIR)
@@ -21,28 +22,28 @@ $(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
+	touch $(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" \
-	 package
+	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+	./ipkg/rules package
 
-$(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list: $(PKG_IPK)
+$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK)
 	$(IPKG) install $(PKG_IPK)
 
 source: $(DL_DIR)/$(PKG_SOURCE_FILE)
 prepare: $(PKG_BUILD_DIR)/ipkg/rules
 compile: $(PKG_IPK)
-install: $(IPKG_STATE_DIR)/info/lib$(PKG_NAME).list
+install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list
 
 clean:
 	-cd $(PKG_BUILD_DIR); \
-	ipkg/rules \
-	  TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
-	 clean
+	TOPDIR="$(TOPDIR)" IPKG_RULES_INC="$(TOPDIR)/rules.mk" \
+	./ipkg/rules clean
 	rm -rf $(PKG_BUILD_DIR)
 	rm -f $(PKG_IPK)
 
-- 
cgit v1.2.3