[openap-cvs] : wl11000 Makefile,1.10,1.11

[David Kimdon <address@hidden>]

Update of /cvsroot/openap/wl11000
In directory subversions:/tmp/cvs-serv19957

Modified Files:
        Makefile 
Log Message:
don't set path when building tools, other minor changes.


Index: Makefile
===================================================================
RCS file: /cvsroot/openap/wl11000/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile    17 Jul 2002 20:35:33 -0000      1.10
+++ Makefile    18 Jul 2002 04:15:38 -0000      1.11
@@ -39,6 +39,7 @@
 CONFIG_TARGET:=$(shell echo $(CONFIG_TARGET))
 CONFIG_SITE:=$(TOPDIR)/$(shell echo $(CONFIG_SITE))
 ARCH:=$(shell echo $(CONFIG_TARGET) | sed -e 's/-.*//')
+TARGET_PATH:=$(CONFIG_PREFIX)/$(CONFIG_TARGET)
 
 CC=$(CONFIG_TARGET)-gcc
 LD=$(CONFIG_TARGET)-ld
@@ -52,9 +53,12 @@
 # FIXME: actually set host CC?
 HOSTCC = /usr/bin/gcc -B/usr/bin/
 
+# if we are building the toolchain we don't need or want to change the path
+ifneq ($(MAKECMDGOALS),tools)
 
PATH:=$(CONFIG_PREFIX)/$(CONFIG_TARGET)/$(ARCH)-linux/bin:$(CONFIG_PREFIX)/$(CONFIG_TARGET)/bin:$(PATH)
-export HOSTCC OPENAP_VERSION TOPDIR CONFIG_SITE PATH TOOL_PREFIX
+endif
 
+export HOSTCC OPENAP_VERSION TOPDIR CONFIG_SITE PATH TOOL_PREFIX TARGET_PATH 
ARCH
 
 # Convienience target, create a cross-compiling shell.  The logic above sets
 # some environmental variables that tell make, configure etc. to do the right
@@ -90,8 +94,9 @@
        cd build && tar -xzf ../misc/gcc-2.95-uclibc-20020711.src.tar.gz
        patch -p0 < misc/uclibc-build.diff
        cd build/gcc-2.95 && make \
-               TARGET_PATH=$(CONFIG_PREFIX)/$(CONFIG_TARGET) \
-               ARCH=$(ARCH)
+               TARGET_PATH=$(TARGET_PATH) \
+               ARCH=$(ARCH) | \
+               tee build.log
 
 cramfs:
        $(MAKE) CC=gcc -C $(KERNEL_DIR)/scripts/cramfs/
@@ -309,5 +314,5 @@
        done
        $(RM) flash flash.md5
 
-.PHONY : uclibc version $(SUBDIRS)
+.PHONY : uclibc version $(SUBDIRS) flash