xnu-1228.tar.gz

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

diff --git a/libkern/conf/tools/doconf/Makefile b/libkern/conf/tools/doconf/Makefile
index 2bf0b7a10f0abc4e6e23ea63e3c6c50f3a674156..aa55a9419d28b928df2fbc97800cfb7e948ffd48 100644 (file)
--- a/libkern/conf/tools/doconf/Makefile
+++ b/libkern/conf/tools/doconf/Makefile
@@ -16,7 +16,11 @@ INST_SUBDIRS = \
 # Who and where
 #
 BINDIR= 
+ifneq ($(MACHINE_CONFIG), DEFAULT)
+DSTDIR= $(strip $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)_$(MACHINE_CONFIG)/$(COMPONENT)/)
+else
 DSTDIR= $(strip $(OBJROOT)/$(KERNEL_CONFIG)_$(ARCH_CONFIG)/$(COMPONENT)/)
+endif
 PROGRAM= $(DSTDIR)doconf
 
 # 
@@ -25,25 +29,19 @@ PROGRAM= $(DSTDIR)doconf
 IFLAGS= -c -m 555
 
 $(PROGRAM): $(DSTDIR)% : $(SOURCE)%.csh
-       @echo "[ $(SOURCE) ] make setup_build_all $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)";
-       -$(RM) $(RMFLAGS) $(notdir $(PROGRAM)).VERS 
-       sed -e "s/#PROGRAM.*/#`vers_string $(notdir $(PROGRAM))`/" \
+       @-$(RM) $(RMFLAGS) $(notdir $(PROGRAM)).VERS 
+       @sed -e "s/#PROGRAM.*/#`vers_string $(notdir $(PROGRAM))`/" \
                < $< >$(notdir $(PROGRAM)).VERS;
-       install $(IFLAGS) $(notdir $(PROGRAM)).VERS $(PROGRAM);
-       -$(RM) $(RMFLAGS) $(notdir $(PROGRAM)).VERS;
+       @install $(IFLAGS) $(notdir $(PROGRAM)).VERS $(PROGRAM);
+       @-$(RM) $(RMFLAGS) $(notdir $(PROGRAM)).VERS;
 
 do_build_setup: $(PROGRAM)
 
 do_build_all:
-       @echo "[ $(SOURCE) ] make do_build_all $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 setup_build_install:
-       @echo "[ $(SOURCE) ] make setup_build_all $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 do_build_install:
-       @echo "[ $(SOURCE) ] make do_build_all $(KERNEL_CONFIG) $(ARCH_CONFIG) $(TARGET)"
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)
-
-