From 18a93b31a8b191461caa8ea22e4851f32acc9b01 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 3 Feb 2011 10:40:20 +0000
Subject: [PATCH] [packages] minidlna: fix iconv switch fallout

SVN-Revision: 25340
---
 multimedia/minidlna/Makefile                         |  4 ++++
 .../minidlna/patches/002-makefile-tweaks.patch       | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile
index 2fed224b36..772d7e2d84 100644
--- a/multimedia/minidlna/Makefile
+++ b/multimedia/minidlna/Makefile
@@ -21,6 +21,10 @@ PKG_BUILD_PARALLEL:=0
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/nls.mk
 
+MAKE_VARS += \
+	ICONV_PREFIX="$(ICONV_PREFIX)" \
+	INTL_PREFIX="$(INTL_PREFIX)"
+
 define Package/minidlna
   SECTION:=multimedia
   CATEGORY:=Multimedia
diff --git a/multimedia/minidlna/patches/002-makefile-tweaks.patch b/multimedia/minidlna/patches/002-makefile-tweaks.patch
index 4b769bfb60..f357c2d43b 100644
--- a/multimedia/minidlna/patches/002-makefile-tweaks.patch
+++ b/multimedia/minidlna/patches/002-makefile-tweaks.patch
@@ -15,17 +15,17 @@
 +	 -I$(STAGING_DIR)/usr/include/libexif \
 +	 -I$(STAGING_DIR)/usr/include/uuid \
 +	 -I$(STAGING_DIR)/usr/include/vorbis \
-+	 -I$(STAGING_DIR)/usr/lib/libiconv/include \
-+	 -I$(STAGING_DIR)/usr/lib/libintl/include
++	 -I$(ICONV_PREFIX)/include \
++	 -I$(INTL_PREFIX)/include
 +LDFLAGS = -L$(STAGING_DIR)/usr/lib \
-+	  -L$(STAGING_DIR)/usr/lib/libintl/lib \
-+	  -L$(STAGING_DIR)/usr/lib/libiconv/lib \
++	  -L$(ICONV_PREFIX)/lib \
++	  -L$(INTL_PREFIX)/lib \
 +	  -Wl,-rpath=$(STAGING_DIR)/usr/lib \
 +	  -Wl,-rpath-link=$(STAGING_DIR)/usr/lib
  #STATIC_LINKING: LDFLAGS = -static
  CC = gcc
  RM = rm -f
-@@ -36,7 +48,7 @@
+@@ -36,7 +48,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes
  
  ALLOBJS = $(BASEOBJS) $(LNXOBJS)
  
@@ -34,7 +34,7 @@
  #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm
  
  TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o
-@@ -58,7 +70,7 @@
+@@ -58,7 +70,7 @@ install:	minidlna
  	$(INSTALL) -d $(ETCINSTALLDIR)
  	$(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR)
  
-- 
2.30.2