Changeset 587 for trunk/Config.kmk

Timestamp:

Nov 24, 2006, 6:17:33 AM (19 years ago)

Author:

bird

Message:

Hacking *nix install build for Gentoo.

File:

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

trunk/Config.kmk

@@ -40 +40 @@
         KBUILD_VERSION_MINOR=$(KBUILD_VERSION_MINOR) \
         KBUILD_VERSION_PATCH=$(KBUILD_VERSION_PATCH)
+
+#
+# Check if we're building a *nix installation.
+#
+ifdef NIX_INSTALL_DIR
+NIX_INSTALL_DIR_BIN    := $(patsubst /%,%,$(NIX_INSTALL_DIR))/bin
+NIX_INSTALL_DIR_SHARED := $(patsubst /%,%,$(NIX_INSTALL_DIR))/shared/kBuild
+DEFS += \
+        PATH_KBUILD=\"/$(NIX_INSTALL_DIR_SHARED)\" \
+        PATH_KBUILD_BIN=\"/$(NIX_INSTALL_DIR_BIN)\"
+endif
                                         
 #
@@ -53 +64 @@
 TEMPLATE_BIN_CFLAGS.release     = -O3
 TEMPLATE_BIN_LDFLAGS            = -Zhigh-mem -Zstack=1024
+ ifdef NIX_INSTALL_DIR
+TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
+ else
 TEMPLATE_BIN_INST               = kBuild/bin/x86.os2/
+ endif
 endif
 
@@ -61 +76 @@
 TEMPLATE_BIN_CFLAGS.release     = -O3
 TEMPLATE_BIN_LDFLAGS            = 
+ ifdef NIX_INSTALL_DIR
+TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
+ else
 TEMPLATE_BIN_INST               = kBuild/bin/$(BUILD_TARGET_ARCH).$(BUILD_TARGET)/
+ endif
 endif
 
@@ -90 +109 @@
         $(PATH_DEV)/x86.win32/sdk200209/lib/AdvAPI32.Lib
 TEMPLATE_BIN_LIBS.profile       = g:/coding/vbox/trunk/out/win32/debug/lib/kPrf2.lib
+ ifdef NIX_INSTALL_DIR
+TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
+ else
 TEMPLATE_BIN_INST               = kBuild/bin/x86.win32/
+ endif
 endif
 
@@ -105 +128 @@
 TEMPLATE_BIN_INCS              += $(PATH_ROOT)/src/gmake/glob /usr/local/include
 endif
+ ifdef NIX_INSTALL_DIR
+TEMPLATE_BIN_INST               = $(NIX_INSTALL_DIR_BIN)/
+ else
 TEMPLATE_BIN_INST               = kBuild/bin/$(BUILD_TARGET_ARCH).$(BUILD_TARGET)/
+ endif
 endif
-
-
 
 #
@@ -120 +145 @@
 
 
-LIB_KDEP = $(PATH_OUT)/$(TEMPLATE_LIB_INST)$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBPREF)kDep$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBSUFF)
+LIB_KDEP = $(PATH_OBJ)/src/lib/kDep/$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBPREF)kDep$(TOOL_$(TEMPLATE_LIB_TOOL)_ARLIBSUFF)