Cleanup pango package.

SVN-Revision: 12845

diff --git a/XOrg/lib/pango/Makefile b/XOrg/lib/pango/Makefile
index c071e13a1d6051beebeb9e4bd04f0859adf8664a..94666ecb8cc866748c0bc1e1116e2b960eda3eee 100644 (file)
--- a/XOrg/lib/pango/Makefile
+++ b/XOrg/lib/pango/Makefile
@@ -1,10 +1,11 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # blogic@openwrt.org
+# $Id$
 
 include $(TOPDIR)/rules.mk
 
@@ -19,9 +20,12 @@ PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-               -L$(STAGING_DIR)/usr/lib/libiconv/lib/ \
-                          -L$(STAGING_DIR)/usr/lib/libintl/lib/ 
+PKG_INSTALL=1
+
+TARGET_LDFLAGS+= \
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -L$(STAGING_DIR)/usr/lib/libiconv/lib \
+       -L$(STAGING_DIR)/usr/lib/libintl/lib
 
 define Package/pango
   SECTION:=xorg-libs
@@ -39,33 +43,39 @@ the GTK+ widget toolkit as a test platform. Pango forms the core of text
 and font handling for GTK+-2.x.
 endef
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{lib/pkgconfig,include/pango-1.0/pango/,bin/,lib/pango/1.6.0/modules}
-       $(CP) $(PKG_BUILD_DIR)/pango/.libs/*so* $(PKG_INSTALL_DIR)/usr/lib/
-       rm -f $(PKG_INSTALL_DIR)/usr/lib/*T
-       $(CP) $(PKG_BUILD_DIR)/pango/.libs/pango-querymodules $(PKG_INSTALL_DIR)/usr/bin/
-       cd $(PKG_BUILD_DIR) ;for a in `find -name pango-*.so`; do cp $$$$a $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/;done
-       $(CP) $(PKG_BUILD_DIR)/pango/*.la $(PKG_INSTALL_DIR)/usr/lib/
-       $(CP) $(PKG_BUILD_DIR)/*.pc $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/
-       rm $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*uninstalled.pc
-       $(CP) $(PKG_BUILD_DIR)/pango/*.h $(PKG_INSTALL_DIR)/usr/include/pango-1.0/pango/
-endef
-
 define Build/InstallDev
-       $(INSTALL_DIR) $(1)/usr/{lib,include}
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       $(SED) 's,Libs:,Libs: -L$$$${libdir}/libiconv/lib/ -L$$$${libdir}/libintl/lib/ ,g' $(1)/usr/lib/pkgconfig/pango*.pc
+       $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,lib/pango/1.6.0/modules,include}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \
+               $(1)/usr/lib
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*{.so*,la} \
+               $(1)/usr/lib/pango/1.6.0/modules/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+               $(1)/usr/lib/pkgconfig
+
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/* \
+               $(1)/usr/include/
 endef
 
 define Package/pango/install
-       $(INSTALL_DIR) $(1)/usr/{lib,bin}
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-       $(CP) -r $(PKG_INSTALL_DIR)/usr/lib/pango/ $(1)/usr/lib
+       $(INSTALL_DIR) $(1)/usr/{lib/pango/1.6.0/modules,bin}
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
+
+       $(INSTALL_DATA) \
+               $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.so* \
+               $(1)/usr/lib/pango/1.6.0/modules/
+
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/pango-querymodules \
+               $(1)/usr/bin/
+
        $(INSTALL_DIR) $(1)/etc/init.d/
        $(INSTALL_BIN) ./files/pango-querymodules.init $(1)/etc/init.d/pango-querymodules
 endef