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

Diff for /src/usr.bin/make/parse.c between version 1.30 and 1.31

version 1.30, 1999/12/16 17:07:21 version 1.31, 1999/12/16 17:27:18
Line 1535 
Line 1535 
         Boolean   oldOldVars = oldVars;          Boolean   oldOldVars = oldVars;
   
         oldVars = FALSE;          oldVars = FALSE;
         cp = Var_Subst(NULL, cp, ctxt, FALSE);          cp = Var_Subst(cp, ctxt, FALSE);
         oldVars = oldOldVars;          oldVars = oldOldVars;
   
         Var_Set(line, cp, ctxt);          Var_Set(line, cp, ctxt);
Line 1551 
Line 1551 
              * expansion on the whole thing. The resulting string will need               * expansion on the whole thing. The resulting string will need
              * freeing when we're done, so set freeCmd to TRUE.               * freeing when we're done, so set freeCmd to TRUE.
              */               */
             cp = Var_Subst(NULL, cp, VAR_CMD, TRUE);              cp = Var_Subst(cp, VAR_CMD, TRUE);
             freeCmd = TRUE;              freeCmd = TRUE;
         }          }
   
Line 1715 
Line 1715 
      * Substitute for any variables in the file name before trying to       * Substitute for any variables in the file name before trying to
      * find the thing.       * find the thing.
      */       */
     file = Var_Subst (NULL, file, VAR_CMD, FALSE);      file = Var_Subst(file, VAR_CMD, FALSE);
   
     /*      /*
      * Now we know the file's name and its search path, we attempt to       * Now we know the file's name and its search path, we attempt to
Line 1915 
Line 1915 
      * Substitute for any variables in the file name before trying to       * Substitute for any variables in the file name before trying to
      * find the thing.       * find the thing.
      */       */
     file = Var_Subst (NULL, file, VAR_CMD, FALSE);      file = Var_Subst(file, VAR_CMD, FALSE);
   
     /*      /*
      * Now we know the file's name, we attempt to find the durn thing.       * Now we know the file's name, we attempt to find the durn thing.
Line 2586 
Line 2586 
 #endif  #endif
                     ParseFinishLine();                      ParseFinishLine();
   
                     cp = Var_Subst (NULL, line, VAR_CMD, TRUE);                      cp = Var_Subst(line, VAR_CMD, TRUE);
                     free (line);                      free (line);
                     line = cp;                      line = cp;
   
Legend:
Removed from v.1.30  
changed lines
  Added in v.1.31