Describe __PACKAGE__ in perldelta

[p5sagit/p5-mst-13.2.git] / README.win32

diff --git a/README.win32 b/README.win32
index 0128469..40badf2 100644 (file)
--- a/README.win32
+++ b/README.win32
@@ -78,60 +78,30 @@ but it doesn't hurt to do so.
 
 =back
 
-=head2 Building and Installation
+=head2 Building
 
 =over 4
 
 =item *
 
-The "win32" directory contains *.mak files for use with the NMAKE that
-comes with Visual C++ ver. 4.0 and above.  If you wish to build perl
-using Visual C++ versions between 2.0 and 4.0, do the following two
-additional steps (these steps are not required if you are
-using Visual C++ versions 4.0 and above):
-
-=over 8
-
-=item 1.
-
-Overwrite the *.mak files in the win32 subdirectory with the versions
-in the win32\VC-2.0 directory.
-
-=item 2.
-
-Reset your INCLUDE environment variable to the MSVC include directory.
-For example:
-
-       set INCLUDE=E:\MSVC20\INCLUDE
-
-This must have only one directory (a list of directories will not work).
-VCVARS32.BAT may put multiple locations in there, which is why this step
-is required.
-
-=back
-
-=item * 
-
 Make sure you are in the "win32" subdirectory under the perl toplevel.
+This directory contains a "Makefile" that will work with
+versions of NMAKE that come with Visual C++ ver. 2.0 and above.
 
 =item *
 
-Type "nmake" while in the "win32" subdirectory.  This should build
-everything.  Specifically, it will create perl.exe, perl.dll, and
-perlglob.exe at the perl toplevel, and various other extension dll's
-under the lib\auto directory.  If the make fails for any reason, make
-sure you have done the previous steps correctly.
+Edit the Makefile and change the values of INST_DRV and INST_TOP
+if you want perl to be installed in a location other than "C:\PERL".
 
 =item *
 
-Type "nmake install".  This will put the newly built perl and the
-libraries under C:\PERL.  If you want to alter this location, to say,
-D:\FOO\PERL, you will have to say:
-
-       nmake install INST_TOP=D:\FOO\PERL
+If you are using Visual C++ ver. 4.0 and above: type "nmake".
+If you are using a Visual C++ ver. 2.0: type "nmake CCTYPE=MSVC20".
 
-instead.  To use the Perl you just installed, make sure you set your
-PATH environment variable to C:\PERL\BIN (or D:\FOO\PERL\BIN).
+This should build everything.  Specifically, it will create perl.exe,
+perl.dll, and perlglob.exe at the perl toplevel, and various other
+extension dll's under the lib\auto directory.  If the make fails for
+any reason, make sure you have done the previous steps correctly.
 
 =back
 
@@ -141,14 +111,18 @@ Type "nmake test".  This will run most of the tests from the
 testsuite (many tests will be skipped, and but no test should fail).
 
 If some tests do fail, it may be because you are using a different command
-shell than the native "cmd.exe".  To get a more detailed breakdown of the
-tests that failed, you may want to say:
-
-       cd ..\t
-       .\perl harness
+shell than the native "cmd.exe".
 
 Please report any failures as described under L<BUGS AND CAVEATS>.
 
+=head2 Installation
+
+Type "nmake install".  This will put the newly built perl and the
+libraries under "C:\PERL" (actually whatever you set INST_TOP to
+in the Makefile).  To use the Perl you just installed, set your
+PATH environment variable to "C:\PERL\BIN" (or $(INST_TOP)\BIN, if you
+changed the default as above).
+
 =head1 BUGS AND CAVEATS
 
 This is still very much an experimental port, and should be considered
@@ -255,6 +229,6 @@ at the time.
 Nick Ing-Simmons and Gurusamy Sarathy have made numerous and
 sundry hacks since then.
 
-Last updated: 05 April 1997
+Last updated: 13 April 1997
 
 =cut