Changeset 578 for trunk/src

Timestamp:

Nov 23, 2006, 11:36:46 AM (19 years ago)

Author:

bird

Message:

Did code changes for unix installation. Will do install goals when creating the gentoo ebuild. references #6

Location:

trunk/src/gmake

Files:

• main.c (modified) (1 diff)
• variable.c (modified) (1 diff)

trunk/src/gmake/main.c

@@ -3070 +3070 @@
 
 #ifdef KMK
+# ifdef PATH_KBUILD
+  printf (_("%s\n\
+%sPATH_KBUILD default:     '%s'\n\
+%sPATH_KBUILD_BIN default: '%s'\n"),
+          precede, precede, PATH_KBUILD, precede, PATH_KBUILD_BIN);
+# endif /* PATH_KBUILD */
   if (!remote_description || *remote_description == '\0')
     printf (_("\n%sThis program is built for %s/%s/%s [" __DATE__ " " __TIME__ "]\n"),

trunk/src/gmake/variable.c

@@ -1006 +1006 @@
 
   /* The build platform defaults. */
-  envvar = getenv("BUILD_PLATFORM");
+  envvar = getenv ("BUILD_PLATFORM");
   if (!envvar)
       (void) define_variable ("BUILD_PLATFORM", sizeof("BUILD_PLATFORM") - 1, 
                               BUILD_PLATFORM, o_default, 0);
-  envvar = getenv("BUILD_PLATFORM_ARCH");
+  envvar = getenv ("BUILD_PLATFORM_ARCH");
   if (!envvar)
       (void) define_variable ("BUILD_PLATFORM_ARCH", sizeof("BUILD_PLATFORM_ARCH") - 1, 
                               BUILD_PLATFORM_ARCH, o_default, 0);
-  envvar = getenv("BUILD_PLATFORM_CPU");
+  envvar = getenv ("BUILD_PLATFORM_CPU");
   if (!envvar)
       (void) define_variable ("BUILD_PLATFORM_CPU", sizeof("BUILD_PLATFORM_CPU") - 1, 
                               BUILD_PLATFORM_CPU, o_default, 0);
+
+# ifdef PATH_KBUILD
+  /* define the installed. */
+  envvar = getenv("PATH_KBUILD");
+  if (!envvar)
+  {
+      (void) define_variable ("PATH_KBUILD", sizeof("PATH_KBUILD") - 1, 
+                              PATH_KBUILD, o_default, 0);
+      envvar = getenv("PATH_KBUILD_BIN");
+      if (!envvar)
+          (void) define_variable ("PATH_KBUILD_BIN", sizeof("PATH_KBUILD_BIN") - 1, 
+                                  PATH_KBUILD_BIN, o_default, 0);
+  }
+# endif 
+
 
   /* Define KMK_FEATURES to indicate various working KMK features. */