xnu-1228.tar.gz

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

diff --git a/libkern/kmod/Makefile b/libkern/kmod/Makefile
index 3bad6a04fb384f6ec4fa5702f8d7ccb01b1bd15c..7a50b88bdb1b587ea70b2addcbf7ac5737f2b1ae 100644 (file)
--- a/libkern/kmod/Makefile
+++ b/libkern/kmod/Makefile
@@ -7,29 +7,33 @@ export MakeInc_dir=${SRCROOT}/makedefs/MakeInc.dir
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
-COMPOBJROOT = $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+ifneq ($(MACHINE_CONFIG), DEFAULT)
+export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)_$(MACHINE_CONFIG)/$(COMPONENT)
+else
+export COMPOBJROOT=$(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)
+endif
 
 do_all: 
-       @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(MACH_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";             \
+       @echo "[ $(SOURCE) ] Starting do_all  $(COMPONENT) $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";          \
        ($(MKDIR) $(COMPOBJROOT)/kmod;                                  \
        cd $(COMPOBJROOT)/kmod;                                         \
        ${MAKE} MAKEFILES=$(SOURCE)/Makefile.kmod                       \
                TARGET=$(TARGET)                                        \
                do_build_all                                            \
        );                                                              \
-       echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(MACH_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
+       echo "[ $(SOURCE) ] Returning do_all $(COMPONENT) $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
 do_build_all:  do_all
 
 do_install: 
-       @echo "[ $(SOURCE) ] Starting do_install  $(COMPONENT) $(MACH_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";         \
+       @echo "[ $(SOURCE) ] Starting do_install  $(COMPONENT) $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";              \
        ($(MKDIR) $(COMPOBJROOT)/kmod;                                  \
        cd $(COMPOBJROOT)/kmod;                                         \
        ${MAKE} MAKEFILES=$(SOURCE)/Makefile.kmod                       \
                TARGET=$(TARGET)                                        \
                do_build_install                                        \
        );                                                              \
-       echo "[ $(SOURCE) ] Returning do_install $(COMPONENT) $(MACH_KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
+       echo "[ $(SOURCE) ] Returning do_install $(COMPONENT) $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
 
 do_build_install:      do_install