 @@ -1,14 +1,14 @@
-.\"	$NetBSD: make.1,v 1.172 2010/05/13 18:10:16 joerg Exp $
+.\"	$NetBSD: make.1,v 1.173 2010/06/06 01:13:12 sjg Exp $
 .\"
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
 .\" are met:
 .\" 1. Redistributions of source code must retain the above copyright
 .\"    notice, this list of conditions and the following disclaimer.
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. Neither the name of the University nor the names of its contributors
 @@ -781,28 +781,30 @@ is set in the environment or on the comm
 is set in the environment or on the command line.)
 .It
 .Ev ${.CURDIR} Ns Pa /obj. Ns Ev ${MACHINE}
 .It
 .Ev ${.CURDIR} Ns Pa /obj
 .It
 .Pa /usr/obj/ Ns Ev ${.CURDIR}
 .It
 .Ev ${.CURDIR}
 .El
 .Pp
 Variable expansion is performed on the value before it's used,
 so expressions such as
-.Dl ${.CURDIR:C,^/usr/src,/var/obj,}
+.Dl ${.CURDIR:S,^/usr/src,/var/obj,}
 may be used.
 This is especially useful with
 .Ql Ev MAKEOBJDIR .
 .Pp
 .Ql Va .OBJDIR
 may be modified in the makefile as a global variable.
 In all cases,
 .Nm
 will
 .Xr chdir 2
 to
 .Ql Va .OBJDIR
 and set
 .Ql Ev PWD
 to that directory before executing any targets.
+.
 @@ -1310,26 +1312,35 @@ then
 will exit.
 .It Ic .export Ar variable ...
 Export the specified global variable.
 If no variable list is provided, all globals are exported
 except for internal variables (those that start with
 .Ql \&. ) .
 This is not affected by the
 .Fl X
 flag, so should be used with caution.
 .Pp
 Appending a variable name to
 .Va .MAKE.EXPORTED
 is equivalent to exporting a variable.
 .It Ic .export-env Ar variable ...
 The same as
 .Ql .export ,
 except that the variable is not appended to
 .Va .MAKE.EXPORTED .
 This allows exporting a value to the environment which is different from that
 used by
 .Nm
 internally.
 .It Ic .info Ar message
 The message is printed along with the name of the makefile and line number.
 .It Ic .undef Ar variable
 Un-define the specified global variable.
 Only global variables may be un-defined.
 .It Ic .unexport Ar variable ...
 The opposite of
 .Ql .export .
 The specified global
 .Va variable
 will be removed from
 .Va .MAKE.EXPORTED .
 If no variable list is provided, all globals are unexported,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: var.c,v 1.158 2010/04/21 04:25:27 sjg Exp $	*/
+/*	$NetBSD: var.c,v 1.159 2010/06/06 01:13:12 sjg Exp $	*/
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -59,34 +59,34 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: var.c,v 1.158 2010/04/21 04:25:27 sjg Exp $";
+static char rcsid[] = "$NetBSD: var.c,v 1.159 2010/06/06 01:13:12 sjg Exp $";
 #else
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 3/19/94";
 #else
-__RCSID("$NetBSD: var.c,v 1.158 2010/04/21 04:25:27 sjg Exp $");
+__RCSID("$NetBSD: var.c,v 1.159 2010/06/06 01:13:12 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
 /*-
  * var.c --
  *	Variable-handling functions
+ *
  * Interface:
  *	Var_Set		    Set the value of a variable in the given
  *			    context. The variable is created if it doesn't
  *			    yet exist. The value and variable name need not
  *			    be preserved.
 @@ -672,57 +672,64 @@ Var_ExportVars(void)
 /*
  * This is called when .export is seen or
  * .MAKE.EXPORTED is modified.
  * It is also called when any exported var is modified.
  */
 void
 Var_Export(char *str, int isExport)
+{
     char *name;
     char *val;
     char **av;
     char *as;
     int track;
     int ac;
     int i;
     if (isExport && (!str || !str[0])) {
 	var_exportedVars = VAR_EXPORTED_ALL; /* use with caution! */
 	return;
+    }
     if (strncmp(str, "-env", 4) == 0) {
 	track = 0;
 	str += 4;
     } else {
 	track = VAR_EXPORT_PARENT;
+    }
     val = Var_Subst(NULL, str, VAR_GLOBAL, 0);
     av = brk_string(val, &ac, FALSE, &as);
     for (i = 0; i < ac; i++) {
 	name = av[i];
 	if (!name[1]) {
 	    /*
 	     * A single char.
 	     * If it is one of the vars that should only appear in
 	     * local context, skip it, else we can get Var_Subst
 	     * into a loop.
 	     */
 	    switch (name[0]) {
 	    case '@':
 	    case '%':
 	    case '*':
 	    case '!':
 		continue;
+	    }
+	}
-	if (Var_Export1(name, VAR_EXPORT_PARENT)) {
+	if (Var_Export1(name, track)) {
 	    if (VAR_EXPORTED_ALL != var_exportedVars)
 		var_exportedVars = VAR_EXPORTED_YES;
-	    if (isExport) {
+	    if (isExport && track) {
 		Var_Append(MAKE_EXPORTED, name, VAR_GLOBAL);
+	    }
+	}
+    }
     free(val);
     free(as);
     free(av);
+}
 /*
  * This is called when .unexport[-env] is seen.
  */