Fix dhcp-forwarder build, move init-script to ./files/

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

openwrt/package/Makefile

@@ -74,7 +74,7 @@ package-$(BR2_PACKAGE_USBUTILS) += usbutils
 package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
 package-$(BR2_PACKAGE_WOL) += wol
 package-$(BR2_PACKAGE_ZLIB) += zlib
-package-$(BR2_PACKAGE_DHCPFWD) += dhcp-forwarder
+package-$(BR2_PACKAGE_DHCP_FORWARDER) += dhcp-forwarder
 package-$(BR2_PACKAGE_LIBGD) += libgd
 package-$(BR2_PACKAGE_LIBNET) += libnet
 package-$(BR2_PACKAGE_LIBMYSQLCLIENT) += mysql

openwrt/package/dhcp-forwarder/Config.in

@@ -1,5 +1,5 @@
 config BR2_PACKAGE_DHCP_FORWARDER
-	tristate "dhcp-forwarder (a DHCP relay agent)"
+	tristate "dhcp-forwarder - a DHCP relay agent"
 	default m if CONFIG_DEVEL
 	help
 	  A DHCP relay agent

openwrt/package/dhcp-forwarder/Makefile

@@ -56,10 +56,10 @@ $(PKG_BUILD_DIR)/.built:
 	touch $(PKG_BUILD_DIR)/.built
 	
 $(IPKG_DHCP_FORWARDER):
-	install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc/init.d
-	install -m0755 ./ipkg/$(PKG_NAME).init $(IDIR_DHCP_FORWARDER)/etc/init.d/dhcp-fwd
 	install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc
 	install -m0644 $(PKG_BUILD_DIR)/contrib/dhcp-fwd.conf $(IDIR_DHCP_FORWARDER)/etc/
+	install -m0755 -d $(IDIR_DHCP_FORWARDER)/etc/init.d
+	install -m0755 ./files/dhcp-fwd.init $(IDIR_DHCP_FORWARDER)/etc/init.d/dhcp-fwd
 	install -m0755 -d $(IDIR_DHCP_FORWARDER)/usr/bin
 	cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/
 	$(RSTRIP) $(IDIR_DHCP_FORWARDER)