add missing dependency on freeradius to freeradius-mod-radutmp, tweak makefile

[openwrt/svn-archive/archive.git] / XOrg / app / xine-ui / Makefile

diff --git a/XOrg/app/xine-ui/Makefile b/XOrg/app/xine-ui/Makefile
index f7822e7aec6c66e40b3591c17880d2acd07dab78..c61a5d151c94cfffbfbc3cfd5228242e925b9ea5 100644 (file)
--- a/XOrg/app/xine-ui/Makefile
+++ b/XOrg/app/xine-ui/Makefile
@@ -14,6 +14,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.sourceforge.net/xine/
+PKG_FIXUP = libtool
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,7 +28,11 @@ define Package/xine-ui
   DEPENDS:=+xine-lib +libpng +curl +libiconv +libXv +libICE +libXxf86vm
 endef
 
-CONFIGURE_VARS+=PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
+CONFIGURE_VARS+= \
+       PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
+
+EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
+
 CONFIGURE_ARGS+=--without-aalib \
                        --without-libcaca \
                        --disable-lirc \
@@ -46,17 +51,17 @@ define Build/Configure
 endef
 
 define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
+       $(MAKE) -C $(PKG_BUILD_DIR) X_LIBS="-L$(STAGING_DIR)/usr/lib -lnotimpl -lfreetype"
        $(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
 endef
 
-define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)/
-endef
-
 define Package/xine-ui/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/share/xine \
+               $(PKG_INSTALL_DIR)/usr/share/pixmaps \
+               $(1)/usr/share/
 endef
 
 $(eval $(call BuildPackage,xine-ui))