X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=Xorg%2Fxorg%2Flib%2FlibXft%2FMakefile;h=ab1ef82eae6c28bf603b3e006671db20146752d1;hp=08488e40dd801aa8c1bf6135d62bf332622baa56;hb=1d52707a7133eddd750d6b84cc880245ee65a24f;hpb=a4aec035146f59d7fae62db3878b39e0a1810d4d

diff --git a/Xorg/xorg/lib/libXft/Makefile b/Xorg/xorg/lib/libXft/Makefile
index 08488e40dd..ab1ef82eae 100644
--- a/Xorg/xorg/lib/libXft/Makefile
+++ b/Xorg/xorg/lib/libXft/Makefile
@@ -1,21 +1,23 @@
-# 
+#
 # Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
+
 include $(TOPDIR)/rules.mk
 
-PKG_BASE_NAME:=libXft
 PKG_NAME:=libXft
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=2.1.13
+
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP=libtool
+PKG_MD5SUM:=bc8881851f3bd8dcc625fac37350a1c6
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,21 +30,24 @@ define Package/libXft
   URL:=http://xorg.freedesktop.org/
 endef
 
-define Build/Compile
-	$(call $(PKG_NAME)/Compile)
-	make -C $(PKG_BUILD_DIR)
-	mkdir -p $(PKG_INSTALL_DIR)
-	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xft}
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \
+		$(1)/usr/lib/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+		$(1)/usr/lib/pkgconfig/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/include/X11/Xft/* \
+		$(1)/usr/include/X11/Xft/
 endef
 
 define Package/libXft/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib 
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)
-	$(CP) $(PKG_INSTALL_DIR)/* $(1)/
+	$(INSTALL_DATA) \
+		$(PKG_INSTALL_DIR)/usr/lib/*.so* \
+		$(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libXft))