Changeset 39 for trunk/src/kmk

Timestamp:

Mar 27, 2003, 1:33:46 AM (22 years ago)

Author:

bird

Message:

No sys.mk in NMAKE.

File:

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

trunk/src/kmk/main.c

@@ -79 +79 @@
  */
 
-#ifdef USE_KLIB
+#if defined(USE_KLIB) || defined(KMK)
     #define KLIB_INSTRICT
     #include <kLib/kLib.h>
@@ -819 +819 @@
                 sysMkPath = Lst_Init (FALSE);
                 Dir_Expand (_PATH_DEFSYSMK, sysIncPath, sysMkPath);
+                #ifdef NMAKE
+                if (!Lst_IsEmpty(sysMkPath))
+                {
+                    ln = Lst_Find(sysMkPath, (ClientData)NULL, ReadMakefile);
+                    if (ln != NILLNODE)
+                            Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
+                }
+                /* Fatal("make: no system rules (%s).", _PATH_DEFSYSMK); */
+                #else
                 if (Lst_IsEmpty(sysMkPath))
                         Fatal("make: no system rules (%s).", _PATH_DEFSYSMK);
@@ -824 +833 @@
                 if (ln != NILLNODE)
                         Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
+                #endif
         }
 
@@ -832 +842 @@
                 if (ln != NILLNODE)
                         Fatal("make: cannot open %s.", (char *)Lst_Datum(ln));
-        } else if (!ReadMakefile("makefile", NULL))
-                (void)ReadMakefile("Makefile", NULL);
+        } else
+            #ifdef KMK
+            if (    !ReadMakefile("Makefile.kMk", NULL)
+                #if KFILE_CASE
+                ||  !ReadMakefile("makefile.kMk", NULL)
+                ||  !ReadMakefile("Makefile.kmk", NULL)
+                ||  !ReadMakefile("makefile.kmk", NULL)
+                ||  !ReadMakefile("makefile", NULL)
+                #endif
+                )
+                (void)ReadMakefile("Makefile", NULL);
+            #else
+            if (!ReadMakefile("makefile", NULL))
+                (void)ReadMakefile("Makefile", NULL);
+            #endif
 
         (void)ReadMakefile(".depend", NULL);