X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=XOrg%2Ffont-native%2Ffont-util%2FMakefile;h=2fa62da8eb4592555a477b18ced7a0c19e5ec04b;hb=aeb5a46d17a6658c99c06fc7833820e36ba7ad8f;hp=ed06305448ae3905b10ab695f54a60b32ddc551b;hpb=ca496254a5ab8b8ae811d1147c6d9b17b1d425b6;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/XOrg/font-native/font-util/Makefile b/XOrg/font-native/font-util/Makefile
index ed06305448..2fa62da8eb 100644
--- a/XOrg/font-native/font-util/Makefile
+++ b/XOrg/font-native/font-util/Makefile
@@ -16,6 +16,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.2/src/font
 
 include $(INCLUDE_DIR)/package.mk
+STAGING_DIR=$(STAGING_DIR_HOST)
 
 define Package/font-util
   SECTION:=xorg-font
@@ -35,9 +36,10 @@ define Build/Compile
 endef
 
 define Build/InstallDev
-	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/pkgconfig/fontutil.pc $(1)/usr/lib/pkgconfig/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(1)/usr/lib/X11 $(1)/usr/bin
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/pkgconfig/fontutil.pc $(1)/usr/lib/pkgconfig
 	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/X11/* $(1)/usr/lib/X11/
-	$(CP) $(PKG_INSTALL_DIR)/usr/local/bin/* $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/* $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,font-util))