Changeset 2202 for trunk/Config.kmk

Timestamp:

Jan 6, 2009, 3:33:42 PM (17 years ago)

Author:

bird

Message:

Config.kmk/Makefile.kmk: Some cleanup/fixes.

File:

• trunk/Config.kmk (modified) (5 diffs)

trunk/Config.kmk

@@ -132 +132 @@
 TEMPLATE_BIN_DEFS.profile       = NDEBUG
 TEMPLATE_BIN_DEFS.release       = NDEBUG
+if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
+ TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
+else
+ TEMPLATE_BIN_INST             = kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
+endif
 
 ifeq ($(KBUILD_TARGET),os2)
@@ -139 +144 @@
 TEMPLATE_BIN_CFLAGS.release     = -O3
 TEMPLATE_BIN_LDFLAGS            = -Zhigh-mem -Zstack=1024 -g
- if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
-TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
- else
-TEMPLATE_BIN_INST               = kBuild/bin/os2.x86/
- endif
 endif
 
@@ -164 +164 @@
  endif
  TEMPLATE_BIN_LDFLAGS.profile   = -pg
- if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
-  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
- else
-  TEMPLATE_BIN_INST             = kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
- endif
 endif
 
@@ -209 +204 @@
   #     $(PATH_TOOL_$(TEMPLATE_BIN_TOOL)_LIB)/msvcprt.lib - avoid this to save space!
  endif
- if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
-  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
- else
-  TEMPLATE_BIN_INST             = kBuild/bin/win.$(KBUILD_TARGET_ARCH)/
- endif
 endif
 
@@ -254 +244 @@
   TEMPLATE_BIN_LDFLAGS         += -Wl,-i
  endif
- if defined(NIX_INSTALL_DIR) && !defined(KBUILD_BOOTSTRAP)
-  TEMPLATE_BIN_INST             = $(NIX_INSTALL_DIR_BIN)/
- else
-  TEMPLATE_BIN_INST             = kBuild/bin/$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
- endif
 endif