X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=XOrg%2Fapp%2Ffontconfig%2FMakefile;h=f1a3c8029fc85e93247c1ecb18fb37ce36c72ba9;hp=e0000a4ec8900e5c7b9c7da1be8c2e67273d61cc;hb=289168da7d3b3b20ca039539871483bd25a4e325;hpb=e1f5239271a3d6c445374b16d183f9334e2afbac;ds=sidebyside

diff --git a/XOrg/app/fontconfig/Makefile b/XOrg/app/fontconfig/Makefile
index e0000a4ec8..f1a3c8029f 100644
--- a/XOrg/app/fontconfig/Makefile
+++ b/XOrg/app/fontconfig/Makefile
@@ -14,11 +14,10 @@ PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://fontconfig.org/release/
+PKG_FIXUP=libtool
 
 include $(INCLUDE_DIR)/package.mk
 
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" --disable-docs
-
 define Package/fontconfig
   SECTION:=xorg-util
   CATEGORY:=Xorg
@@ -38,8 +37,7 @@ endef
 
 define Build/Compile
 	$(foreach dir,fc-case fc-lang fc-glyphname, $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) CFLAGS="";)
-	$(MAKE) -C $(PKG_BUILD_DIR) 
-	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install
+	$(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" all install
 endef
 
 define Package/fontconfig/install
@@ -52,7 +50,6 @@ define Build/InstallDev
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-	$(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(1)/usr/lib\'," $(1)/usr/lib/libfontconfig.la
 endef
 
 $(eval $(call BuildPackage,fontconfig))