wire in DEF_OLD_VARS, still needs more work (oldVars variable)

SCCS-vsn: usr.bin/make/config.h 5.7
SCCS-vsn: usr.bin/make/main.c 5.7
SCCS-vsn: usr.bin/make/var.c 5.4

diff --git a/usr/src/usr.bin/make/config.h b/usr/src/usr.bin/make/config.h
index d828724..8ab53c9 100644 (file)
--- a/usr/src/usr.bin/make/config.h
+++ b/usr/src/usr.bin/make/config.h
@@ -19,7 +19,7 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  *

- *     @(#)config.h    5.6 (Berkeley) %G%
+ *     @(#)config.h    5.7 (Berkeley) %G%

  */
 
 #define        DEFSHELL        1                       /* Bourne shell */
  */
 
 #define        DEFSHELL        1                       /* Bourne shell */


@@ -51,14 +51,6 @@
 #define INCLUDES
 #define LIBRARIES
 
 #define INCLUDES
 #define LIBRARIES
 

-/*
- * DEF_OLD_VARS
- *     If defined, variable substitution follows the make style. PMake-style
- *     substitution cannot be turned on. In addition, pmake will never
- *     generate a warning for an undefined variable.
- */
-/*#define DEF_OLD_VARS*/
-

 /*
  * LIBSUFF
  *     Is the suffix used to denote libraries and is used by the Suff module
 /*
  * LIBSUFF
  *     Is the suffix used to denote libraries and is used by the Suff module

diff --git a/usr/src/usr.bin/make/main.c b/usr/src/usr.bin/make/main.c
index 602fcfc..6c1db9f 100644 (file)
--- a/usr/src/usr.bin/make/main.c
+++ b/usr/src/usr.bin/make/main.c
@@ -27,7 +27,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.6 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.7 (Berkeley) %G%";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -487,11 +487,7 @@ main (argc, argv)
     } else {
        amMake = FALSE;
        backwards = FALSE;      /* Do things MY way, not MAKE's */
     } else {
        amMake = FALSE;
        backwards = FALSE;      /* Do things MY way, not MAKE's */

-#ifdef DEF_OLD_VARS

        oldVars = TRUE;
        oldVars = TRUE;

-#else
-       oldVars = FALSE;        /* don't substitute for undefined variables */
-#endif

     }
 
     /*
     }
 
     /*

diff --git a/usr/src/usr.bin/make/var.c b/usr/src/usr.bin/make/var.c
index 3f5d4dd..5d1d076 100644 (file)
--- a/usr/src/usr.bin/make/var.c
+++ b/usr/src/usr.bin/make/var.c
@@ -21,7 +21,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)var.c      5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)var.c      5.4 (Berkeley) %G%";

 #endif /* not lint */
 
 /*-
 #endif /* not lint */
 
 /*-


@@ -1725,12 +1725,6 @@ Var_Subst (str, ctxt, undefErr)
                 * the string...
                 */
                if (oldVars) {
                 * the string...
                 */
                if (oldVars) {

-#ifndef DEF_OLD_VARS
-                   if (!sysVmake && !amMake && undefErr && !errorReported) {
-                       Parse_Error (PARSE_WARNING,
-                                    "Undefined variable \"%.*s\"",length,str);
-                   }
-#endif

                    str += length;
                } else if (undefErr) {
                    /*
                    str += length;
                } else if (undefErr) {
                    /*