X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fdnsmasq%2FMakefile;h=64ae0f49f0f4c1a91fe8185901f6d368a8f04053;hb=c80e7a81f74b2b8554da699c3bd9011d503e720f;hp=210b1569070a927dceeb110e306101305a070cd9;hpb=d4a1203540b1cd063821ae7892d0c29169217d94;p=openwrt-10.03%2F.git

diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index 210b15690..64ae0f49f 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.25
 PKG_RELEASE:=1
-PKG_MD5SUM:=b38f33cd0703fa664a37a4595d918189
+PKG_MD5SUM:=a5a387aed551acf91990567a5e8e4fa4
 
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -16,13 +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
+	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)