bluez-utils: sdpd is no longer a separate daemon.

[openwrt/svn-archive/archive.git] / XOrg / font-native / font-util / Makefile

diff --git a/XOrg/font-native/font-util/Makefile b/XOrg/font-native/font-util/Makefile
index ea0cd3dd1c8d4afade12152f941e080942cf2bc2..8e96ac0845bff46485a5031ed4e2d4d6d360338b 100644 (file)
--- a/XOrg/font-native/font-util/Makefile
+++ b/XOrg/font-native/font-util/Makefile
@@ -16,7 +16,6 @@ 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
@@ -36,9 +35,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 $(2)/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/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/* $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/* $(2)/bin/
 endef
 
 $(eval $(call BuildPackage,font-util))