fixes package instalation for X f00
git-svn-id: svn://svn.openwrt.org/openwrt/packages@11259 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@ -13,7 +13,7 @@ PKG_VERSION:=1.19.4
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||
PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.19/
|
||||
PKG_SOURCE_URL:=ftp://ftp.gnome.org/pub/gnome/sources/pango/1.19/
|
||||
PKG_FIXUP:=libtool
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
@ -42,10 +42,11 @@ endef
|
||||
|
||||
define Build/Compile
|
||||
$(MAKE) -C $(PKG_BUILD_DIR)
|
||||
#$(MAKE) -C $(PKG_BUILD_DIR)/ install DESTDIR=$(PKG_INSTALL_DIR)
|
||||
$(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/{lib/pkgconfig,include/pango-1.0/pango/}
|
||||
$(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
|
||||
@ -55,14 +56,17 @@ 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
|
||||
$(SED) 's,Libs:,Libs: -L${libdir}/libiconv/lib/ -L${libdir}/libintl/lib/ ,g' $(1)/usr/lib/pkgconfig/pango*.pc
|
||||
endef
|
||||
|
||||
define Package/pango/Install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
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
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,pango))
|
||||
|
Reference in New Issue
Block a user