dnsmasq: fix CFLAGS

Closes #1459

dnsmasq takes CFLAGS on make opt rather than env.

Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/CHANGES b/CHANGES
index a5406c366923f54cce3d1a4bf4885a084d986da9..1215a5cf0a09908830c281b0065b51b7f7950d42 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,8 +7,8 @@
 
        New packages: librsync, lmbench, netperf, squid
 
-       Updated/fixed packages: busybox, dosfstools, e2fsprogs,
-       freetype, iperf, iptables, less, libgcrypt, libglib2, libpng,
+       Updated/fixed packages: busybox, dnsmasq, dosfstools, e2fsprogs,
+       freetype, iperf, iptables, iw, less, libgcrypt, libglib2, libpng,
        libxml2, mdadm, memstat, mtd-utils, nano, openssl, php, pppd,
        setserial, squashfs, wget, xlib_libX11, xlib_libXfont
 
@@ -34,6 +34,7 @@
        #1429: [SECURITY] Update php to 5.2.13
        #1441: Add binutils 2.20.1
        #1447: Package installation on target with debug symbols is broken
+       #1459: Misc QA fixes
 
 2010.02, Release February 26th, 2010:
 

diff --git a/package/dnsmasq/dnsmasq.mk b/package/dnsmasq/dnsmasq.mk
index 86b3eef010d80f236720516c7591175a5508c260..d32b794aef0525a0700a7bf8fa8f3d58204032a2 100644 (file)
--- a/package/dnsmasq/dnsmasq.mk
+++ b/package/dnsmasq/dnsmasq.mk
@@ -7,8 +7,8 @@
 DNSMASQ_VERSION = 2.52
 DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq
 DNSMASQ_AUTORECONF = NO
-DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)"
-DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr
+DNSMASQ_MAKE_ENV = CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)"
+DNSMASQ_MAKE_OPT = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)"
 DNSMASQ_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) PREFIX=/usr install
 
 ifneq ($(BR2_INET_IPV6),y)