aboutsummaryrefslogtreecommitdiffstats
path: root/package/dhcp-forwarder
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2005-05-15 13:04:57 +0000
committerNicolas Thill <nico@openwrt.org>2005-05-15 13:04:57 +0000
commitc3873e243620133821063e45934665e6fe24007d (patch)
tree0c8ab9e3c79074eba6d2f96807f1d4ede950245a /package/dhcp-forwarder
parent2678c1115a410ea6e489c2945494d13792409da2 (diff)
downloadmaster-187ad058-c3873e243620133821063e45934665e6fe24007d.tar.gz
master-187ad058-c3873e243620133821063e45934665e6fe24007d.tar.bz2
master-187ad058-c3873e243620133821063e45934665e6fe24007d.zip
Fix dhcp-forwarder build, move init-script to ./files/
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@909 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/dhcp-forwarder')
-rw-r--r--package/dhcp-forwarder/Config.in2
-rw-r--r--package/dhcp-forwarder/Makefile4
-rw-r--r--package/dhcp-forwarder/files/dhcp-fwd.init (renamed from package/dhcp-forwarder/ipkg/dhcp-forwarder.init)0
3 files changed, 3 insertions, 3 deletions
diff --git a/package/dhcp-forwarder/Config.in b/package/dhcp-forwarder/Config.in
index 34ff1c0167..7cddf97478 100644
--- a/package/dhcp-forwarder/Config.in
+++ b/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/package/dhcp-forwarder/Makefile b/package/dhcp-forwarder/Makefile
index 7b9f23841f..7da1928982 100644
--- a/package/dhcp-forwarder/Makefile
+++ b/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/package/dhcp-forwarder/ipkg/dhcp-forwarder.init b/package/dhcp-forwarder/files/dhcp-fwd.init
index 6ad3858e89..6ad3858e89 100644
--- a/package/dhcp-forwarder/ipkg/dhcp-forwarder.init
+++ b/package/dhcp-forwarder/files/dhcp-fwd.init