flow-tools: Make zlib a build time dependency only.

[openwrt/svn-archive/archive.git] / net / dhcp / Makefile

diff --git a/net/dhcp/Makefile b/net/dhcp/Makefile
index d15eb9c67b39b47f38553e74ce7eac19b0da722e..681fddca5454b933c42e72ffc25d7ff6970a4329 100644 (file)
--- a/net/dhcp/Makefile
+++ b/net/dhcp/Makefile
@@ -9,12 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dhcp
-PKG_VERSION:=3.0.3
+PKG_VERSION:=3.0.5
 PKG_RELEASE:=1
-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_MD5SUM:=ce5d30d4645e4eab1f54561b487d1ec7
 PKG_CAT:=zcat
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@@ -22,39 +22,40 @@ PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/dhcp
+define Package/dhcp/Default
   SECTION:=net
   CATEGORY:=Network
-  SUBMENU:=ISC's DHCP implementation
-  TITLE:=ISC's DHCP implementation
-  DESCRIPTION:=ISC's DHCP implementation
-  URL:=http://www.isc.org
+  TITLE:=ISC's DHCP
+  URL:=http://www.isc.org/
 endef
 
 define Package/dhcp-relay
-  $(call Package/dhcp)
-  TITLE:=DHCP relay
-  DESCRIPTION:=DHCP relay
+  $(call Package/dhcp/Default)
+  TITLE+= relay
 endef
 
 define Package/dhcp-server
-  $(call Package/dhcp)
-  TITLE:=DHCP server
-  DESCRIPTION:=DHCP server
+  $(call Package/dhcp/Default)
+  TITLE+= server
 endef
 
 
 define Build/Configure
+       # it's not GNU autoconf stuff
        (cd $(PKG_BUILD_DIR) ; \
+               UNAME_S=Linux \
+               UNAME_M=$(ARCH) \
+               UNAME_R=2.4.34 \
                ./configure \
-                 --copts "$(TARGET_CFLAGS)" \
-                 linux-2.2 \
+                       --copts "$(TARGET_CFLAGS)" \
+                       linux-2.2 \
        );
 endef
 
 define Build/Compile
-       rm -rf $(PKG_INSTALL_DIR)
-       mkdir -p $(PKG_INSTALL_DIR)
+       UNAME_S=Linux \
+       UNAME_M=$(ARCH) \
+       UNAME_R=2.4.34 \
        $(MAKE) -C $(PKG_BUILD_DIR) \
                $(TARGET_CONFIGURE_OPTS) \
                DESTDIR="$(PKG_INSTALL_DIR)" \
@@ -63,12 +64,12 @@ endef
 
        
 define Package/dhcp-relay/install
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin/
 endef
 
 define Package/dhcp-server/install
-       install -d -m0755 $(1)/usr/sbin
+       $(INSTALL_DIR) $(1)/usr/sbin
        $(CP) $(PKG_INSTALL_DIR)/usr/sbin/dhcpd $(1)/usr/sbin/
 endef