From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 28 Apr 2010 01:51:06 +0000 (+0000)
Subject: [packages] ushare: apply the same fix as libdlna in [21215], use PKG_INSTALL
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=9460642c70161161850c264c917b48f2050b63a7;p=openwrt%2Fsvn-archive%2Farchive.git

[packages] ushare: apply the same fix as libdlna in [21215], use PKG_INSTALL


SVN-Revision: 21216
---

diff --git a/multimedia/ushare/Makefile b/multimedia/ushare/Makefile
index e2a7a5c453..cb85af387e 100644
--- a/multimedia/ushare/Makefile
+++ b/multimedia/ushare/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ushare.geexbox.org/releases/
 PKG_MD5SUM:=5bbcdbf1ff85a9710fa3d4e82ccaa251
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ushare
@@ -31,11 +33,14 @@ define Package/ushare/description
  multimedia files.
 endef
 
+MAKE_INSTALL_FLAGS+= \
+	INSTALL="install" \
+
 define Build/Configure
 	# this is *NOT* GNU configure
 	( cd $(PKG_BUILD_DIR); \
 		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS) -lpthread -lavcodec -lavformat -lavutil -lz" \
+		LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=$(STAGING_DIR)/usr/lib" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		./configure \
@@ -51,13 +56,6 @@ define Build/Configure
 	)
 endef
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		INSTALL="install" \
-		all install
-endef
-
 define Package/ushare/conffiles
 /etc/ushare.conf
 endef