X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/44ba04efe200178dd52943b2c1edd8418fbac0ba..fc66ff967a15d664e2543d6a996d792ed39f6759:/package/dnsmasq/Makefile

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index d3ce64736..de2571a79 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -1,35 +1,52 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 # $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.27
+PKG_VERSION:=2.39
 PKG_RELEASE:=1
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
-PKG_MD5SUM:=489198ec87101087043adc98bbe062dc
-PKG_CAT:=zcat
+PKG_MD5SUM:=1ffccc1f0d9b8a08f2b99e03ba9cc08b
 
-include $(TOPDIR)/package/rules.mk
+include $(INCLUDE_DIR)/package.mk
 
 define Package/dnsmasq
-SECTION:=base
-CATEGORY:=Network
-DEFAULT:=y
-TITLE:=A lightweight DNS and DHCP server
-DESCRIPTION:=A lightweight DNS and DHCP server.  It is intended to provide \\\
-coupled DNS and DHCP service to a LAN.
-URL:=http://www.thekelleys.org.uk/dnsmasq/
+  SECTION:=net
+  CATEGORY:=Base system
+  TITLE:=A lightweight DNS and DHCP server
+  DESCRIPTION:=\
+	It is intended to provide coupled DNS and DHCP service to a LAN.
+  URL:=http://www.thekelleys.org.uk/dnsmasq/
+endef
+
+define Package/dnsmasq/conffiles
+/etc/dnsmasq.conf
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS) -DHAVE_ISC_READER=1" \
+		BINDIR="/usr/sbin" MANDIR="/usr/man" \
+		all
 endef
 
 define Package/dnsmasq/install
-	install -m0755 -d $(1)/usr/sbin
-	install -m0755 -d $(1)/etc/init.d/
-	install -m0755 $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/
-	install -m0644 ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
-	install -m0755 ./files/dnsmasq.init $(1)/etc/init.d/S50dnsmasq
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dnsmasq $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DATA) ./files/dhcp.conf $(1)/etc/config/dhcp
+	$(INSTALL_DATA) ./files/dnsmasq.conf $(1)/etc/dnsmasq.conf
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/dnsmasq.init $(1)/etc/init.d/dnsmasq
 endef
 
 $(eval $(call BuildPackage,dnsmasq))