xnu-517.tar.gz

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

diff --git a/libkern/conf/Makefile b/libkern/conf/Makefile
index 85e1a341a48f52f2f0b5f7a5857710179435bfb1..739d5d807f838a083704b5a83772199d12840cb0 100644 (file)
--- a/libkern/conf/Makefile
+++ b/libkern/conf/Makefile
@@ -18,7 +18,7 @@ ifndef LIBKERN_KERNEL_CONFIG
 export LIBKERN_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) $(LIBKERN_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";  \
-       (cd $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG);                            \
        next_source=$(subst conf/,,$(SOURCE));                  \
-       ${MAKE} MAKEFILES=$(TARGET)/$(LIBKERN_KERNEL_CONFIG)/Makefile   \
+       ${MAKE} -C $(COMPOBJROOT)/$(LIBKERN_KERNEL_CONFIG)      \
+               MAKEFILES=$(TARGET)/$(LIBKERN_KERNEL_CONFIG)/Makefile   \
                SOURCE=$${next_source}                  \
                TARGET=$(TARGET)                                        \
                INCL_MAKEDEP=FALSE      \
-               build_all       \
-       );              \
+               KERNEL_CONFIG=$(LIBKERN_KERNEL_CONFIG)  \
+               build_all;      \
        echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(LIBKERN_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
 do_build_all: do_all