[packages] ushare: apply the same fix as libdlna in [21215], use PKG_INSTALL
authorNicolas Thill <nico@openwrt.org>
Wed, 28 Apr 2010 01:51:06 +0000 (01:51 +0000)
committerNicolas Thill <nico@openwrt.org>
Wed, 28 Apr 2010 01:51:06 +0000 (01:51 +0000)
SVN-Revision: 21216

multimedia/ushare/Makefile

index e2a7a5c4534fd55dffde9e5b4ec0a2a3d6a935c4..cb85af387e7f2bb3d82570ad003f32fc576a4482 100644 (file)
@@ -15,6 +15,8 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ushare.geexbox.org/releases/
 PKG_MD5SUM:=5bbcdbf1ff85a9710fa3d4e82ccaa251
 
 PKG_SOURCE_URL:=http://ushare.geexbox.org/releases/
 PKG_MD5SUM:=5bbcdbf1ff85a9710fa3d4e82ccaa251
 
+PKG_INSTALL:=1
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ushare
 include $(INCLUDE_DIR)/package.mk
 
 define Package/ushare
@@ -31,11 +33,14 @@ define Package/ushare/description
  multimedia files.
 endef
 
  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)" \
 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 \
                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
 
        )
 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
 define Package/ushare/conffiles
 /etc/ushare.conf
 endef