From 1a57f7fe60a3d749cff02728571f3d93dc9649c9 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 7 Jul 2004 01:54:05 +0000
Subject: [PATCH] Finally get around to fixing the ipkg-build dependancy (thx
 nico)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@72 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 obsolete-buildroot/Makefile          | 4 ++--
 obsolete-buildroot/make/iproute2.mk  | 2 +-
 obsolete-buildroot/make/oidentd.mk   | 2 +-
 obsolete-buildroot/make/sched-mod.mk | 2 +-
 obsolete-buildroot/make/wshaper.mk   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/obsolete-buildroot/Makefile b/obsolete-buildroot/Makefile
index e2219c66d..ad629967e 100644
--- a/obsolete-buildroot/Makefile
+++ b/obsolete-buildroot/Makefile
@@ -97,7 +97,7 @@ INSTALL_LIBGCJ:=false
 # The list of stuff to build for the target filesystem
 #
 #############################################################
-TARGETS:=host-sed gcc3_3 openwrt-base openwrt-code.bin
+TARGETS:=host-sed gcc3_3 ipkg-utils openwrt-base openwrt-code.bin
 
 PACKAGES:=oidentd iproute2 sched-modules wshaper
 
@@ -192,7 +192,7 @@ PACKAGES_IPK:=$(patsubst %,%-ipk,$(PACKAGES))
 
 
 $(BUILD_DIR)/Packages : $(PACKAGES_IPK)
-	(cd $(BUILD_DIR) ; ipkg-make-index . > Packages)
+	(cd $(BUILD_DIR) ; $(IPKG_MAKE_INDEX) . > Packages)
 
 world: $(DL_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) $(TARGETS) $(PACKAGES_IPK) $(BUILD_DIR)/Packages
 	@echo "ALL DONE."
diff --git a/obsolete-buildroot/make/iproute2.mk b/obsolete-buildroot/make/iproute2.mk
index 7d58309a2..350b8fb87 100644
--- a/obsolete-buildroot/make/iproute2.mk
+++ b/obsolete-buildroot/make/iproute2.mk
@@ -79,7 +79,7 @@ iproute2-dirclean:
 iproute2-ipk:	$(IPROUTE2_IPKTARGET)
 
 $(IPROUTE2_IPKTARGET):	$(IPROUTE2_DIR)/ipkg/rules
-	(cd $(IPROUTE2_DIR); ipkg-buildpackage )
+	(cd $(IPROUTE2_DIR); $(IPKG_BUILDPACKAGE) )
 	
 $(IPROUTE2_DIR)/ipkg/rules:	$(IPROUTE2_DIR)/tc/tc $(DL_DIR)/$(IPROUTE2_IPKSRC)
 	tar -C $(IPROUTE2_DIR) -zxf $(DL_DIR)/$(IPROUTE2_IPKSRC)
diff --git a/obsolete-buildroot/make/oidentd.mk b/obsolete-buildroot/make/oidentd.mk
index e0d8a4b00..67cf74d42 100644
--- a/obsolete-buildroot/make/oidentd.mk
+++ b/obsolete-buildroot/make/oidentd.mk
@@ -68,7 +68,7 @@ $(OIDENTD_DIR)/$(OIDENTD_TARGET):	$(OIDENTD_DIR)/.configured
 	
 
 $(BUILD_DIR)/$(OIDENTD_IPKTARGET):	$(OIDENTD_DIR)/$(OIDENTD_TARGET) $(OIDENTD_DIR)/ipkg/rules
-	(cd $(OIDENTD_DIR); ipkg-buildpackage)
+	(cd $(OIDENTD_DIR); $(IPKG_BUILDPACKAGE))
 	
 	
 		
diff --git a/obsolete-buildroot/make/sched-mod.mk b/obsolete-buildroot/make/sched-mod.mk
index 0a27d7f27..c04bceea8 100644
--- a/obsolete-buildroot/make/sched-mod.mk
+++ b/obsolete-buildroot/make/sched-mod.mk
@@ -37,7 +37,7 @@ $(BUILD_DIR)/$(SCHEDM)/ipkg/control : $(DL_DIR)/$(SCHEDMIPK_SRC) $(BUILD_DIR)/$(
 
 # now that we have it all in place, just build it
 $(BUILD_DIR)/$(SCHEDM_TARGET):	$(BUILD_DIR)/$(SCHEDM)/ipkg/control $(BUILD_DIR)/$(SCHEDM)/modules/2.4.20/net/sched/cls_fw.o
-	cd $(BUILD_DIR)/$(SCHEDM); ipkg-buildpackage -c
+	cd $(BUILD_DIR)/$(SCHEDM); $(IPKG_BUILDPACKAGE)
  		
 
 
diff --git a/obsolete-buildroot/make/wshaper.mk b/obsolete-buildroot/make/wshaper.mk
index ff910907e..d892a6056 100644
--- a/obsolete-buildroot/make/wshaper.mk
+++ b/obsolete-buildroot/make/wshaper.mk
@@ -43,7 +43,7 @@ $(BUILD_DIR)/$(WSHAPER)/ipkg/control  :	$(BUILD_DIR)/$(WSHAPER)/.unpacked $(DL_D
 	
 # now that we have it all in place, just build it
 $(BUILD_DIR)/$(WSHAPER_TARGET):	$(BUILD_DIR)/$(WSHAPER)/ipkg/control
-	cd $(BUILD_DIR)/$(WSHAPER); ipkg-buildpackage -c
+	cd $(BUILD_DIR)/$(WSHAPER); $(IPKG_BUILDPACKAGE)