X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6852231594b1341a2273a8477829446b110cfb29..0e6bb471b054032aa7d53c31a3e33d7dc4c684bd:/package/dnsmasq/Makefile

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index c6b7a8a9f..eeaad10e4 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dnsmasq
-PKG_VERSION:=2.22
+PKG_VERSION:=2.26
 PKG_RELEASE:=1
-PKG_MD5SUM:=b38f33cd0703fa664a37a4595d918189
+PKG_MD5SUM:=ae04abb5db4a8cc43c24f432f0c44d5c
 
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -16,14 +16,21 @@ include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,DNSMASQ,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
 $(PKG_BUILD_DIR)/.built:
-	$(MAKE) CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
-		BINDIR=/usr/sbin MANDIR=/usr/man -C $(PKG_BUILD_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS)" \
+		BINDIR=/usr/sbin MANDIR=/usr/man
 	touch $@
 
 $(IPKG_DNSMASQ):
-	mkdir -p $(IDIR_DNSMASQ)/usr/sbin
-	cp $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/
+	install -d -m0755 $(IDIR_DNSMASQ)/usr/sbin
+	$(CP) $(PKG_BUILD_DIR)/src/$(PKG_NAME) $(IDIR_DNSMASQ)/usr/sbin/
 	$(STRIP) $(IDIR_DNSMASQ)/usr/sbin/*
+	install -d -m0755 $(IDIR_DNSMASQ)/etc/init.d/
+	install -m0644 ./files/dnsmasq.conf $(IDIR_DNSMASQ)/etc/dnsmasq.conf
+	install -m0755 ./files/S50dnsmasq $(IDIR_DNSMASQ)/etc/init.d/S50dnsmasq
 	$(IPKG_BUILD) $(IDIR_DNSMASQ) $(PACKAGE_DIR)