[Nasm-cvs] nasm/doc nasmdoc.src,1.23,1.24

[<hp...@us...>]

Update of /cvsroot/nasm/nasm/doc
In directory usw-pr-cvs1:/tmp/cvs-serv26159/doc

Modified Files:
	nasmdoc.src 
Log Message:
Change the NASM environment variable to NASMOPT.


Index: nasmdoc.src
===================================================================
RCS file: /cvsroot/nasm/nasm/doc/nasmdoc.src,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- nasmdoc.src	30 Apr 2002 21:09:16 -0000	1.23
+++ nasmdoc.src	4 May 2002 04:11:00 -0000	1.24
@@ -561,7 +561,7 @@
 
 If you want to define a \e{standard} \i{include search path},
 similar to \c{/usr/include} on Unix systems, you should place one or
-more \c{-i} directives in the \c{NASM} environment variable (see
+more \c{-i} directives in the \c{NASMOPT} environment variable (see
 \k{nasmenv}).
 
 For Makefile compatibility with many C compilers, this option can also
@@ -762,13 +762,13 @@
 You will need the version number if you report a bug.
 
 
-\S{nasmenv} The \c{NASM} \i{Environment} Variable
+\S{nasmenv} The \c{NASMOPT} \i{Environment} Variable
 
-If you define an environment variable called \c{NASM}, the program
+If you define an environment variable called \c{NASMOPT}, the program
 will interpret it as a list of extra command-line options, which are
 processed before the real command line. You can use this to define
 standard search directories for include files, by putting \c{-i}
-options in the \c{NASM} variable.
+options in the \c{NASMOPT} variable.
 
 The value of the variable is split up at white space, so that the
 value \c{-s -ic:\\nasmlib} will be treated as two separate options.
@@ -778,12 +778,15 @@
 nonsensical words \c{-dNAME="my} and \c{name"}.
 
 To get round this, NASM provides a feature whereby, if you begin the
-\c{NASM} environment variable with some character that isn't a minus
+\c{NASMOPT} environment variable with some character that isn't a minus
 sign, then NASM will treat this character as the \i{separator
-character} for options. So setting the \c{NASM} variable to the
+character} for options. So setting the \c{NASMOPT} variable to the
 value \c{!-s!-ic:\\nasmlib} is equivalent to setting it to \c{-s
 -ic:\\nasmlib}, but \c{!-dNAME="my name"} will work.
 
+This variable was called \c{NASM} in earlier versions of NASM,
+however, this caused problems with makefiles which used a \c{$(NASM)}
+variable.
 
 \H{qstart} \i{Quick Start} for \i{MASM} Users
 
@@ -5655,7 +5658,7 @@
 
 \b Which version of NASM you're using, and exactly how you invoked
 it. Give us the precise command line, and the contents of the
-\c{NASM} environment variable if any.
+\c{NASMOPT} environment variable if any.
 
 \b Which versions of any supplementary programs you're using, and
 how you invoked them. If the problem only becomes visible at link