openvpn without ssl closes #277/#278

[openwrt.git] / openwrt / package / dhcp-forwarder / Makefile

diff --git a/openwrt/package/dhcp-forwarder/Makefile b/openwrt/package/dhcp-forwarder/Makefile
index 7b9f238..a7cb909 100644 (file)
--- a/openwrt/package/dhcp-forwarder/Makefile
+++ b/openwrt/package/dhcp-forwarder/Makefile
@@ -2,16 +2,16 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME := dhcp-forwarder
-PKG_VERSION := 0.7
-PKG_RELEASE := 4
-PKG_MD5SUM := e7f876e615ebc3f96418f6477b4451e2
+PKG_NAME:=dhcp-forwarder
+PKG_VERSION:=0.7
+PKG_RELEASE:=4
+PKG_MD5SUM:=e7f876e615ebc3f96418f6477b4451e2
 
-PKG_SOURCE_URL := http://savannah.nongnu.org/download/dhcp-fwd
-PKG_SOURCE := $(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_CAT := bzcat
+PKG_SOURCE_URL:=http://savannah.nongnu.org/download/dhcp-fwd
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_CAT:=bzcat
 
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
@@ -30,6 +30,7 @@ $(PKG_BUILD_DIR)/.configured:
                  --program-prefix="" \
                  --program-suffix="" \
                  --prefix=/usr \
+                 --disable-dietlibc \
                  --exec-prefix=/usr \
                  --bindir=/usr/bin \
                  --datadir=/usr/share \
@@ -47,20 +48,20 @@ $(PKG_BUILD_DIR)/.configured:
        touch $@
 
 $(PKG_BUILD_DIR)/.built:
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               cfg_filename="/etc/dhcp-fwd.conf"
+       rm -rf $(PKG_INSTALL_DIR)
        mkdir -p $(PKG_INSTALL_DIR)
        $(MAKE) -C $(PKG_BUILD_DIR) \
+               cfg_filename="/etc/dhcp-fwd.conf" \
                DESTDIR="$(PKG_INSTALL_DIR)" \
-               install
-       touch $(PKG_BUILD_DIR)/.built
+               all install
+       touch $@
        
 $(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/
+       $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcp-fwd $(IDIR_DHCP_FORWARDER)/usr/bin/
        $(RSTRIP) $(IDIR_DHCP_FORWARDER)
        $(IPKG_BUILD) $(IDIR_DHCP_FORWARDER) $(PACKAGE_DIR)