Changeset 917 for trunk/src/gmakenew/main.c

Timestamp:

May 25, 2007, 12:39:22 AM (18 years ago)

Author:

bird

Message:

PATH_KBUILD and PATH_KBUILD_BIN improvements. Avoid LOCALEDIR, ALIASDIR, LIBDIR and INCLUDEDIR.

File:

• trunk/src/gmakenew/main.c (modified) (4 diffs)

trunk/src/gmakenew/main.c

@@ -26 +26 @@
 #include "debug.h"
 #include "getopt.h"
+#ifdef KMK
+# include "kbuild.h"
+#endif
 
 #include <assert.h>
@@ -1113 +1116 @@
   initialize_main(&argc, &argv);
 
+#ifdef KMK
+  init_kbuild (argc, argv);
+#endif
+
   default_goal_file = 0;
   reading_file = 0;
@@ -1130 +1137 @@
   /* Set up gettext/internationalization support.  */
   setlocale (LC_ALL, "");
+#ifndef LOCALEDIR /* bird */
   bindtextdomain (PACKAGE, LOCALEDIR);
   textdomain (PACKAGE);
+#endif
 
 #ifdef  POSIX
@@ -3244 +3253 @@
 # 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 */
+%sPATH_KBUILD:     '%s' (default '%s')\n\
+%sPATH_KBUILD_BIN: '%s' (default '%s')\n"),
+          precede,
+          precede, get_path_kbuild(), PATH_KBUILD
+          precede, get_path_kbuild_bin(), PATH_KBUILD_BIN);
+# else  /* !PATH_KBUILD */
+  printf (_("%s\n\
+%sPATH_KBUILD:     '%s'\n\
+%sPATH_KBUILD_BIN: '%s'\n"),
+          precede,
+          precede, get_path_kbuild(),
+          precede, get_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"),