[packages] minidlna: fix iconv switch fallout
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 3 Feb 2011 10:40:20 +0000 (10:40 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 3 Feb 2011 10:40:20 +0000 (10:40 +0000)
SVN-Revision: 25340

multimedia/minidlna/Makefile
multimedia/minidlna/patches/002-makefile-tweaks.patch

index 2fed224..772d7e2 100644 (file)
@@ -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
index 4b769bf..f357c2d 100644 (file)
 +       -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)