Changeset 731 for trunk/Config.kmk

Timestamp:

Dec 17, 2006, 5:19:16 AM (19 years ago)

Author:

bird

Message:

kBuild/bin/BUILD_PLATFORM_ARCH.BUILD_PLATFORM -> kBuild/bin/BUILD_PLATFORM.BUILD_PLATFORM_ARCH

File:

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

trunk/Config.kmk

@@ -67 +67 @@
 TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
  else
-TEMPLATE_BIN_INST               = kBuild/bin/x86.os2/
+TEMPLATE_BIN_INST               = kBuild/bin/os2.x86/
  endif
 endif
@@ -79 +79 @@
 TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
  else
-TEMPLATE_BIN_INST               = kBuild/bin/$(BUILD_TARGET_ARCH).$(BUILD_TARGET)/
+TEMPLATE_BIN_INST               = kBuild/bin/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/
  endif
 endif
 
-ifeq ($(filter-out x86.win32 x86.win x86.nt,$(BUILD_TARGET_ARCH).$(BUILD_TARGET)),)
+ifeq ($(filter-out win nt,$(BUILD_TARGET)),)
 include $(PATH_KBUILD)/tools/VCC70.kmk  # fixme! template expanding does something bad to _LIBS /me thinks.
 TEMPLATE_BIN_TOOL               = VCC70
@@ -105 +105 @@
 TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
  else
-TEMPLATE_BIN_INST               = kBuild/bin/x86.win32/
+TEMPLATE_BIN_INST               = kBuild/bin/win.$(BUILD_TARGET_ARCH)/
  endif
 endif
@@ -124 +124 @@
 TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
  else
-TEMPLATE_BIN_INST               = kBuild/bin/$(BUILD_TARGET_ARCH).$(BUILD_TARGET)/
+TEMPLATE_BIN_INST               = kBuild/bin/$(BUILD_TARGET).$(BUILD_TARGET_ARCH)/
  endif
 endif