fix ushare

diff --git a/Makefile b/Makefile
index 8bb34a75d75160a0541e78d72db996b8cfe481d4..d79cb629a81e2921d1cb9fedd423f06a183e0602 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -190,9 +190,9 @@ neutrino-libs:
 # applications.mk
 applications-all:
        if [ $(LCD4LINUX) = "yes" ]; then \
-               $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/xupnpd $(D)/lcd4linux; \
+               $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/ushare $(D)/xupnpd $(D)/lcd4linux; \
        else \
-               $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/xupnpd; \
+               $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/hotplug $(D)/fbshot $(D)/vsftpd $(D)/flashcp $(D)/inadyn $(D)/djmount $(D)/ushare $(D)/xupnpd; \
        fi
 
 # plugins.mk

diff --git a/make/applications.mk b/make/applications.mk
index 38af66510bf544106b22a02564bc184425e229ef..6c62902eaba790d1c145c36dfc58bd2ce37e05ca 100755 (executable)
--- a/make/applications.mk
+++ b/make/applications.mk
@@ -468,8 +468,9 @@ $(D)/ushare: $(D)/libupnp $(ARCHIVE)/ushare-1.1a.tar.bz2 | $(TARGETPREFIX)
        pushd $(BUILD_TMP)/ushare-1.1a && \
                $(PATCH)/ushare1.1a.diff && \
                PKG_CONFIG_PATH="$(TARGETPREFIX)/lib/pkgconfig" \
-               CFLAGS="-I$(TARGETPREFIX)/include/ -I$(TARGETPREFIX)/include/upnp" \
-               LDFLAGS="-L$(TARGETPREFIX)/lib -lz" \
+               CFLAGS="-I$(TARGETPREFIX)/include -I$(TARGETPREFIX)/include/upnp" \
+               LDFLAGS="-L$(TARGETPREFIX)/lib -lz -liconv" \
+               LIBS="-Wl,--rpath-link -Wl,$(TARGETPREFIX)/lib" \
                ./configure --prefix=$(TARGETPREFIX) --cross-prefix=$(TARGET)- --cross-compile --with-libupnp-dir=$(TARGETPREFIX)/lib/ --disable-dlna  && \
                sed -i config.h  -e 's@SYSCONFDIR.*@SYSCONFDIR "/etc"@' && \
                sed -i config.h  -e 's@LOCALEDIR.*@LOCALEDIR "/share"@' && \