[packages] libXrender: add libX11 as dep

[openwrt/svn-archive/archive.git] / XOrg / lib / libSM / Makefile

diff --git a/XOrg/lib/libSM/Makefile b/XOrg/lib/libSM/Makefile
index af9ee7aa1e30057a4e6f1dd06085c1c97cac06d0..839e015b2a665f7dce4494de0bab7685c4f656a4 100644 (file)
--- a/XOrg/lib/libSM/Makefile
+++ b/XOrg/lib/libSM/Makefile
@@ -21,13 +21,13 @@ define Package/libSM
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  +libICE @TARGET_x86
+  DEPENDS:=+xorg-headers-native +util-macros  +libICE @DISPLAY_SUPPORT
   TITLE:=libSM
   URL:=http://xorg.freedesktop.org/
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
+       DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install
 endef
 
 ifeq (libSM,libX11)
@@ -67,7 +67,7 @@ endef
 
 define Package/libSM/install/Default
        $(INSTALL_DIR) $(1)/usr/lib
-       find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -i -t cp -P {} $(1)/usr/lib 
+       find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib 
 endef
 
 define Package/libSM/install
@@ -80,7 +80,8 @@ define Package/libXaw/install
 endef
 
 define Build/InstallDev
-       $(CP) $(PKG_INSTALL_DIR)/* $(STAGING_DIR)
+       $(INSTALL_DIR) $(1)
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
 endef
 
 $(eval $(call BuildPackage,libSM))