diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-06 17:05:09 +0200 |
commit | 208807cc63754f699107bbad24687b3ae1d326fe (patch) | |
tree | 749ada25a27d3659f1b24ae245fe6a416eeb7dae /package/dnsmasq/Makefile | |
parent | f0b814dddb1b74c91fd54af412ad356fc68be4a2 (diff) | |
parent | b03ac31608c2ee5349a5d098980105957a4a6bca (diff) |
fix conflict
Diffstat (limited to 'package/dnsmasq/Makefile')
-rw-r--r-- | package/dnsmasq/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 3cca7cc35..39dd371a5 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq -PKG_VERSION:= 2.55 -PKG_RELEASE:= 3 -PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a +PKG_VERSION:= 2.57 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d10faeb409717eae94718d7716ca63a4 PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= dns PKG_URL:= http://thekelleys.org.uk/dnsmasq/ @@ -20,7 +20,7 @@ CONFIG_STYLE:= manual post-install: ${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc - ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnsmasq ${IDIR_DNSMASQ}/usr/sbin/ + ${INSTALL_BIN} ${WRKINST}/usr/sbin/dnsmasq ${IDIR_DNSMASQ}/usr/sbin ${INSTALL_DATA} ./files/dnsmasq.conf ${IDIR_DNSMASQ}/etc/dnsmasq.conf include ${TOPDIR}/mk/pkg-bottom.mk |