package/tvheadend: Rework CFLAGS handling for liburiparser

Suggested by Thomas:
http://article.gmane.org/gmane.comp.lib.uclibc.buildroot/100646

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/tvheadend/tvheadend.mk b/package/tvheadend/tvheadend.mk
index f593b3f00e23f1da038e46146989a2b31ae12bcb..e0ce160a12e1fceeab8ac546d6492d452d99b21b 100644 (file)
--- a/package/tvheadend/tvheadend.mk
+++ b/package/tvheadend/tvheadend.mk
@@ -32,9 +32,10 @@ ifeq ($(BR2_PACKAGE_LIBICONV),y)
 TVHEADEND_DEPENDENCIES += libiconv
 endif
 
+TVHEADEND_CFLAGS = $(TARGET_CFLAGS)
 ifeq ($(BR2_PACKAGE_LIBURIPARSER),y)
 TVHEADEND_DEPENDENCIES += liburiparser
-TVHEADEND_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)"
+TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE)
 endif
 
 TVHEADEND_DEPENDENCIES += dtv-scan-tables
@@ -43,7 +44,7 @@ define TVHEADEND_CONFIGURE_CMDS
        (cd $(@D);                                              \
                $(TARGET_CONFIGURE_OPTS)                        \
                $(TARGET_CONFIGURE_ARGS)                        \
-               $(TVHEADEND_CONF_ENV)                           \
+               CFLAGS="$(TVHEADEND_CFLAGS)"                    \
                ./configure                                     \
                        --prefix=/usr                           \
                        --arch="$(ARCH)"                        \