From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 24 Dec 2009 06:44:40 +0000 (+0000)
Subject: [packages] mpdas: fix mpdas linking against libiconv & libintl
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=a38c0dcf36a0e4a0dbc9b548a032df906e0d270e;p=packages.git

[packages] mpdas: fix mpdas linking against libiconv & libintl


git-svn-id: svn://svn.openwrt.org/openwrt/packages@18917 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/sound/mpdas/Makefile b/sound/mpdas/Makefile
index ad21cf2d9..79f267c9a 100644
--- a/sound/mpdas/Makefile
+++ b/sound/mpdas/Makefile
@@ -32,9 +32,17 @@ define Package/mpdas/description
     cache the played songs to ~/.mpdascache.
 endef
 
+EXTRA_CPPFLAGS:=\
+	-I$(STAGING_DIR)/usr/lib/libintl/include \
+	-I$(STAGING_DIR)/usr/lib/libiconv/include \
+
+EXTRA_LDFLAGS:=\
+	-L$(STAGING_DIR)/usr/lib/libintl/lib \
+	-L$(STAGING_DIR)/usr/lib/libiconv/lib \
+
 MAKE_FLAGS += \
-	$(TARGET_CONFIGURE_OPTS) \
-	$(1) \
+	CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \
+	LDFLAGS="$(TARGET_LDPFLAGS) $(EXTRA_LDFLAGS)" \
 
 define Package/mpdas/install
 	$(INSTALL_DIR) $(1)/etc
diff --git a/sound/mpdas/patches/001-flags.patch b/sound/mpdas/patches/001-flags.patch
new file mode 100644
index 000000000..f136683dd
--- /dev/null
+++ b/sound/mpdas/patches/001-flags.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -7,8 +7,8 @@ PREFIX = /usr/local
+ MANPREFIX = ${PREFIX}/man/man1
+ CONFIG = $(PREFIX)/etc
+ 
+-CXXFLAGS	+= `pkg-config --cflags libmpd libcurl` 
+-LIBS		= `pkg-config --libs libmpd libcurl`
++CXXFLAGS	+= $(CPPFLAGS) `pkg-config --cflags libmpd libcurl` 
++LIBS		= $(LDFLAGS) `pkg-config --libs libmpd libcurl`
+ 
+ CXXFLAGS	+= -DCONFDIR="\"$(CONFIG)\"" -DVERSION="\"$(VERSION)\""
+