diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-07 22:50:11 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-07 22:50:11 +0100 |
| commit | e01c60984a6a01e9945b80ee7f343514b703b070 (patch) | |
| tree | 97cdf041ae98ccc9c2b2d26c9873aeda912b193e /package | |
| parent | 1168c2a747460b62e85bc021f16f8d21ff2a6b86 (diff) | |
use CFLAGS
Diffstat (limited to 'package')
| -rw-r--r-- | package/dnsmasq/Makefile | 9 | ||||
| -rw-r--r-- | package/dnsmasq/patches/patch-Makefile | 20 | ||||
| -rw-r--r-- | package/dnsmasq/patches/patch-src_config_h | 8 |
3 files changed, 27 insertions, 10 deletions
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile index 3586fe165..6bce7db1e 100644 --- a/package/dnsmasq/Makefile +++ b/package/dnsmasq/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= dnsmasq PKG_VERSION:= 2.55 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= b093d7c6bc7f97ae6fd35d048529232a PKG_DESCR:= A lightweight DNS and DHCP server PKG_SECTION:= dns @@ -17,13 +17,10 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,DNSMASQ,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -INSTALL_STYLE:= manual -MAKE_FLAGS+= BINDIR=/usr/sbin MANDIR=/usr/man COPTS="${TCFLAGS}" - -do-install: +post-install: ${INSTALL_DIR} ${IDIR_DNSMASQ}/usr/sbin ${IDIR_DNSMASQ}/etc - ${INSTALL_BIN} ${WRKBUILD}/src/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 diff --git a/package/dnsmasq/patches/patch-Makefile b/package/dnsmasq/patches/patch-Makefile new file mode 100644 index 000000000..3bc68e266 --- /dev/null +++ b/package/dnsmasq/patches/patch-Makefile @@ -0,0 +1,20 @@ +--- dnsmasq-2.55.orig/Makefile 2010-06-06 21:22:30.000000000 +0200 ++++ dnsmasq-2.55/Makefile 2011-01-07 21:43:23.000000000 +0100 +@@ -13,7 +13,7 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see <http://www.gnu.org/licenses/>. + +-PREFIX = /usr/local ++PREFIX = /usr + BINDIR = ${PREFIX}/sbin + MANDIR = ${PREFIX}/share/man + LOCALEDIR = ${PREFIX}/share/locale +@@ -24,7 +24,7 @@ MSGMERGE = msgmerge + MSGFMT = msgfmt + XGETTEXT = xgettext + +-CFLAGS = -Wall -W -O2 ++CFLAGS ?= -Wall + + ################################################################# + diff --git a/package/dnsmasq/patches/patch-src_config_h b/package/dnsmasq/patches/patch-src_config_h index 5db49ea9a..c58050bd0 100644 --- a/package/dnsmasq/patches/patch-src_config_h +++ b/package/dnsmasq/patches/patch-src_config_h @@ -1,6 +1,6 @@ ---- dnsmasq-2.47.orig/src/config.h 2009-02-05 13:14:24.000000000 +0100 -+++ dnsmasq-2.47/src/config.h 2009-03-19 18:40:37.000000000 +0100 -@@ -45,7 +45,7 @@ +--- dnsmasq-2.55.orig/src/config.h 2010-06-07 23:01:19.000000000 +0200 ++++ dnsmasq-2.55/src/config.h 2011-01-07 21:40:34.000000000 +0100 +@@ -47,7 +47,7 @@ # elif defined(__sun__) || defined (__sun) # define LEASEFILE "/var/cache/dnsmasq.leases" # else @@ -9,7 +9,7 @@ # endif #endif -@@ -282,8 +282,9 @@ typedef unsigned long in_addr_t; +@@ -269,8 +269,9 @@ NOTES: /* We assume that systems which don't have IPv6 headers don't have ntop and pton either */ |