From d22365ac3561c89d8f978758a5c4ecb1074edf96 Mon Sep 17 00:00:00 2001 From: nico Date: Sun, 15 May 2005 13:04:57 +0000 Subject: [PATCH] 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 | 2 +- openwrt/package/dhcp-forwarder/Config.in | 2 +- openwrt/package/dhcp-forwarder/Makefile | 4 ++-- .../{ipkg/dhcp-forwarder.init => files/dhcp-fwd.init} | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename openwrt/package/dhcp-forwarder/{ipkg/dhcp-forwarder.init => files/dhcp-fwd.init} (100%) diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile index 7fc50c1be..872489fb9 100644 --- a/openwrt/package/Makefile +++ b/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 diff --git a/openwrt/package/dhcp-forwarder/Config.in b/openwrt/package/dhcp-forwarder/Config.in index 34ff1c016..7cddf9747 100644 --- a/openwrt/package/dhcp-forwarder/Config.in +++ b/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 diff --git a/openwrt/package/dhcp-forwarder/Makefile b/openwrt/package/dhcp-forwarder/Makefile index 7b9f23841..7da192898 100644 --- a/openwrt/package/dhcp-forwarder/Makefile +++ b/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) diff --git a/openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.init b/openwrt/package/dhcp-forwarder/files/dhcp-fwd.init similarity index 100% rename from openwrt/package/dhcp-forwarder/ipkg/dhcp-forwarder.init rename to openwrt/package/dhcp-forwarder/files/dhcp-fwd.init