Remove #ifdef SYSVVARSUB since the code is required by posix

diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 38d6fd6..1060c69 100644 (file)
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -38,7 +38,7 @@
  *
  *     from: @(#)config.h      8.1 (Berkeley) 6/6/93
  * $FreeBSD: src/usr.bin/make/config.h,v 1.16 2005/02/01 10:50:35 harti Exp $
- * $DragonFly: src/usr.bin/make/config.h,v 1.12 2005/07/15 21:06:29 okumoto Exp $
+ * $DragonFly: src/usr.bin/make/config.h,v 1.13 2005/08/24 00:09:02 okumoto Exp $
  */
 
 #ifndef config_h_efe0765e
@@ -72,11 +72,8 @@
 /*
  * SYSVINCLUDE
  *     Recognize system V like include directives [include "filename"]
- * SYSVVARSUB
- *     Recognize system V like ${VAR:x=y} variable substitutions
  */
 #define        SYSVINCLUDE
-#define        SYSVVARSUB
 
 /*
  * SUNSHCMD

diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index c8382c4..915ba8b 100644 (file)
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -38,7 +38,7 @@
  *
  * @(#)var.c   8.3 (Berkeley) 3/19/94
  * $FreeBSD: src/usr.bin/make/var.c,v 1.83 2005/02/11 10:49:01 harti Exp $
- * $DragonFly: src/usr.bin/make/var.c,v 1.218 2005/08/18 07:58:30 okumoto Exp $
+ * $DragonFly: src/usr.bin/make/var.c,v 1.219 2005/08/24 00:09:02 okumoto Exp $
  */
 
 /**
@@ -379,7 +379,6 @@ VarMatch(const char *word, bool addSpace, Buffer *buf, void *pattern)
        return (addSpace);
 }
 
-#ifdef SYSVVARSUB
 /**
  * Place the word in the buffer if it matches the given pattern.
  * Callback function for VarModify to implement the System V %
@@ -411,7 +410,6 @@ VarSYSVMatch(const char *word, bool addSpace, Buffer *buf, void *patp)
 
        return (addSpace);
 }
-#endif
 
 /**
  * Place the word in the buffer if it doesn't match the given pattern.
@@ -1545,7 +1543,6 @@ modifier_C(VarParser *vp, char value[], Var *v)
 static char *
 sysVvarsub(VarParser *vp, char startc, Var *v, const char value[])
 {
-#ifdef SYSVVARSUB
        /*
         * This can either be a bogus modifier or a System-V substitution
         * command.
@@ -1605,9 +1602,7 @@ sysVvarsub(VarParser *vp, char startc, Var *v, const char value[])
 
                free(patt.lhs);
                free(patt.rhs);
-       } else
-#endif
-       {
+       } else {
                Error("Unknown modifier '%c'\n", *vp->ptr);
                vp->ptr++;
                while (*vp->ptr != '\0') {