Fix dependencies for a lot of xorg packages.

[openwrt/svn-archive/archive.git] / XOrg / font / template.mk

diff --git a/XOrg/font/template.mk b/XOrg/font/template.mk
index a3c69aff47e201c1b1bd0475b57bdfdec5344aab..149f8947012b9ceca28f8613fb868e335266c15d 100644 (file)
--- a/XOrg/font/template.mk
+++ b/XOrg/font/template.mk
@@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=@BASE_NAME@
 PKG_NAME:=@NAME@
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_VERSION:=@VER@
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
-PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
+PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,10 +27,10 @@ define Package/@NAME@
 endef
 
 define Build/InstallDev
-       DESTDIR=$(STAGING_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
+       DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
 endef
 
-CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
+CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4  --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201
 
 define Build/Compile
        UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR)
@@ -43,18 +43,6 @@ define Build/Compile
                        mv {} {}.@NAME@
 endef
 
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-       if [ -x $(CONFIGURE_CMD) ]; then \
-               $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-       fi \
-       )
-endef
-
 define Package/@NAME@/install
        $(INSTALL_DIR) $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/