[BACK]Return to main.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / make

Diff for /src/usr.bin/make/main.c between version 1.103 and 1.104

version 1.103, 2014/05/15 19:40:42 version 1.104, 2014/07/15 23:07:19
Line 578 
Line 578 
 {  {
         /*          /*
          * Read in the built-in rules first, followed by the specified           * Read in the built-in rules first, followed by the specified
          * makefile(s), or the default BSDmakefile, Makefile or           * makefile(s), or the default Makefile or makefile, in that order.
          * makefile, in that order.  
          */           */
         if (!noBuiltins) {          if (!noBuiltins) {
                 LIST sysMkPath;                 /* Path of sys.mk */                  LIST sysMkPath;                 /* Path of sys.mk */
Line 594 
Line 593 
   
         if (!Lst_IsEmpty(makefiles)) {          if (!Lst_IsEmpty(makefiles)) {
                 read_makefile_list(makefiles, d);                  read_makefile_list(makefiles, d);
         } else if (!ReadMakefile("BSDmakefile", d))          } else if (!ReadMakefile("makefile", d))
                 if (!ReadMakefile("makefile", d))                  (void)ReadMakefile("Makefile", d);
                         (void)ReadMakefile("Makefile", d);  
   
         /* read a .depend file, if it exists, and we're not building depend */          /* read a .depend file, if it exists, and we're not building depend */
   

Legend:
Removed from v.1.103  
changed lines
  Added in v.1.104