remove backup/restore for now. will add proper scripts with webif integration later...

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

diff --git a/openwrt/package/dhcp/Makefile b/openwrt/package/dhcp/Makefile
index 70a72c5..4914cc4 100644 (file)
--- a/openwrt/package/dhcp/Makefile
+++ b/openwrt/package/dhcp/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcp
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcp

-PKG_VERSION:=3.0.2
+PKG_VERSION:=3.0.3

 PKG_RELEASE:=1
 PKG_RELEASE:=1

-PKG_MD5SUM:=04800a111521e7442749b2ce883f962b
+PKG_MD5SUM:=f91416a0b8ed3fd0601688cf0b7df58f

 
 PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/dhcp/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SOURCE_URL:=ftp://ftp.isc.org/isc/dhcp/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz


@@ -16,15 +16,14 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(TOPDIR)/package/rules.mk
 
 
 include $(TOPDIR)/package/rules.mk
 

-$(eval $(call PKG_template,DHCP,dhcp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DHCP_RELAY,dhcp-relay,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,DHCP_SERVER,dhcp-server,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))

 
 

-$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
-       (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \
-               $(TARGET_CONFIGURE_OPTS) \
-               CFLAGS="$(TARGET_CFLAGS)" \
-               CPPFLAGS="-I$(STAGING_DIR)/usr/include" \
-               LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+$(PKG_BUILD_DIR)/.configured:
+       (cd $(PKG_BUILD_DIR) ; \

                ./configure \
                ./configure \

+                 --copts "$(TARGET_CFLAGS)" \
+                 linux-2.2 \

        );
        touch $@
 
        );
        touch $@
 


@@ -37,8 +36,14 @@ $(PKG_BUILD_DIR)/.built:
                all install
        touch $@
 
                all install
        touch $@
 

-$(IPKG_DHCP):
-       install -d -m0755 $(IDIR_DHCP)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(IDIR_DHCP)/usr/sbin
-       $(RSTRIP) $(IDIR_DHCP)
-       $(IPKG_BUILD) $(IDIR_DHCP) $(PACKAGE_DIR)
+$(IPKG_DHCP_RELAY):
+       install -d -m0755 $(IDIR_DHCP_RELAY)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(IDIR_DHCP_RELAY)/usr/sbin/
+       $(RSTRIP) $(IDIR_DHCP_RELAY)
+       $(IPKG_BUILD) $(IDIR_DHCP_RELAY) $(PACKAGE_DIR)
+
+$(IPKG_DHCP_SERVER):
+       install -d -m0755 $(IDIR_DHCP_SERVER)/usr/sbin
+       cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(IDIR_DHCP_SERVER)/usr/sbin/
+       $(RSTRIP) $(IDIR_DHCP_SERVER)
+       $(IPKG_BUILD) $(IDIR_DHCP_SERVER) $(PACKAGE_DIR)