build system refactoring in preparation for allowing packages to do host-build steps

[openwrt.git] / tools / ipkg-utils / Makefile

diff --git a/tools/ipkg-utils/Makefile b/tools/ipkg-utils/Makefile
index 06bb2ad..48eb7e3 100644 (file)
--- a/tools/ipkg-utils/Makefile
+++ b/tools/ipkg-utils/Makefile
@@ -14,24 +14,20 @@ PKG_SOURCE_URL:=http://handhelds.org/packages/ipkg-utils/
 PKG_MD5SUM:=da3e3ef772973d7370a6ac95f0fef9b8
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/host-build.mk
 
-define Build/Install
-       mkdir -p $(STAGING_DIR)/etc
-       echo "dest root /" > $(STAGING_DIR)/etc/ipkg.conf
-       echo "option offline_root $(TARGET_DIR)" >> $(STAGING_DIR)/etc/ipkg.conf
-       mkdir -p $(STAGING_DIR)/usr/bin
-       install -m0755 $(PKG_BUILD_DIR)/ipkg-build $(STAGING_DIR)/usr/bin/
-       install -m0755 $(PKG_BUILD_DIR)/ipkg-buildpackage $(STAGING_DIR)/usr/bin/
-       install -m0755 $(PKG_BUILD_DIR)/ipkg-make-index $(STAGING_DIR)/usr/bin/
-       install -m0755 $(PKG_BUILD_DIR)/ipkg.py $(STAGING_DIR)/usr/bin/
+define Host/Install
+       $(INSTALL_BIN) \
+               $(HOST_BUILD_DIR)/ipkg-build \
+               $(HOST_BUILD_DIR)/ipkg-buildpackage \
+               $(HOST_BUILD_DIR)/ipkg-make-index \
+               $(HOST_BUILD_DIR)/ipkg.py \
+               $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
+define Host/Clean
        rm -f $(STAGING_DIR)/etc/ipkg.conf
-       rm -f $(STAGING_DIR)/usr/bin/ipkg*
+       rm -f $(STAGING_DIR_HOST)/bin/ipkg*
 endef
 
 $(eval $(call HostBuild))