xnu-517.tar.gz

[apple/xnu.git] / iokit / conf / Makefile

diff --git a/iokit/conf/Makefile b/iokit/conf/Makefile
index 42a0c8b7bcefb4c9b4bb6c07aff6a0803d45d73f..34ca97c17f05ad40f5a0dad064b967d3d48df472 100644 (file)
--- a/iokit/conf/Makefile
+++ b/iokit/conf/Makefile
@@ -18,7 +18,7 @@ ifndef IOKIT_KERNEL_CONFIG
 export IOKIT_KERNEL_CONFIG = $(KERNEL_CONFIG)
 endif
 
-COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
 
 $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf:
        make build_setup 
@@ -47,14 +47,14 @@ do_setup_conf: $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/doconf \
 
 do_all: do_setup_conf
        @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(IOKIT_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";    \
-       (cd $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG);                              \
        next_source=$(subst conf/,,$(SOURCE));                  \
-       ${MAKE} MAKEFILES=$(TARGET)/$(IOKIT_KERNEL_CONFIG)/Makefile     \
+       ${MAKE} -C $(COMPOBJROOT)/$(IOKIT_KERNEL_CONFIG)        \
+               MAKEFILES=$(TARGET)/$(IOKIT_KERNEL_CONFIG)/Makefile     \
                SOURCE=$${next_source}                  \
                TARGET=$(TARGET)                                        \
                INCL_MAKEDEP=FALSE      \
-               build_all       \
-       );              \
+               KERNEL_CONFIG=$(IOKIT_KERNEL_CONFIG) \
+               build_all;      \
        echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(IOKIT_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
 do_build_all:  do_all