InstallDev should be using (1) and not (STAGING_DIR)

[openwrt/svn-archive/archive.git] / XOrg / app / fontconfig / Makefile

diff --git a/XOrg/app/fontconfig/Makefile b/XOrg/app/fontconfig/Makefile
index 13472dc8170828600076fe846b9dd2529c9497db..e0000a4ec8900e5c7b9c7da1be8c2e67273d61cc 100644 (file)
--- a/XOrg/app/fontconfig/Makefile
+++ b/XOrg/app/fontconfig/Makefile
@@ -9,7 +9,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fontconfig
-PKG_VERSION:=2.3.2
+PKG_VERSION:=2.3.95
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=http://fontconfig.org/release/
 
 include $(INCLUDE_DIR)/package.mk
 
-CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
+CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" --disable-docs
 
 define Package/fontconfig
   SECTION:=xorg-util
@@ -30,13 +30,14 @@ endef
 define Build/Configure
        cd  $(PKG_BUILD_DIR)/; \
                $(TARGET_CONFIGURE_OPTS) \
-               $(subst -fhonour-copts,,$(CONFIGURE_VARS)) \
+               $(CONFIGURE_VARS) \
                $(CONFIGURE_CMD) \
                        $(CONFIGURE_ARGS_XTRA) \
                        $(CONFIGURE_ARGS) 
 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
 endef
@@ -47,13 +48,11 @@ define Package/fontconfig/install
 endef
 
 define Build/InstallDev
-       $(INSTALL_DIR) $(STAGING_DIR)/usr/{lib,include}
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(STAGING_DIR)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(STAGING_DIR)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(STAGING_DIR)/usr/include/
-       $(SED)  "s,"prefix\=.*",prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/fontconfig.pc
-       $(SED)  "s,"exec_prefix\=.*",exec_prefix=$(STAGING_DIR)/usr," $(STAGING_DIR)/usr/lib/pkgconfig/fontconfig.pc
-       $(SED)  "s,"libdir\=\'/usr/lib\'",libdir='$(STAGING_DIR)/usr/lib\'," $(STAGING_DIR)/usr/lib/libfontconfig.la
+       $(INSTALL_DIR) $(1)/usr/{lib,include}
+       $(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))