Better document the various environments with which Makefile.cyg works.

[originally from svn r9670]

diff --git a/README b/README
index 8f2c2116ae60d981b952b819e56e02494ef7cbbb..72fc68c3a97009b3e109c5b8381159f60b0c595d 100644 (file)
--- a/README
+++ b/README
@@ -40,7 +40,7 @@ For building on Windows:
    Makefile.bor' while in the `windows' subdirectory to build all
    the PuTTY binaries.
 
- - windows/Makefile.cyg is for Cygwin / mingw32 installations. Type
+ - windows/Makefile.cyg is for Cygwin / MinGW installations. Type
    `make -f Makefile.cyg' while in the `windows' subdirectory to
    build all the PuTTY binaries.
 
@@ -106,6 +106,10 @@ For building on Unix:
    Subversion then you will need to have built these using Halibut
    first - see below.
 
+ - It's also possible to build the Windows version of PuTTY to run
+   on Unix by using Winelib.  To do this, change to the `windows'
+   directory and run `make -f Makefile.cyg CC=winegcc RC=wrc'.
+
 All of the Makefiles are generated automatically from the file
 `Recipe' by the Perl script `mkfiles.pl' (except for the Unix one,
 which is generated by the `configure' script; mkfiles.pl only

diff --git a/mkfiles.pl b/mkfiles.pl
index 3786d3119316d53f4cd6f3062f3b6cf0cf075a14..b52bf91d95fc977330e9f4f93931686032354f7c 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -433,7 +433,7 @@ if (defined $makefiles{'cygwin'}) {
     ##-- CygWin makefile
     open OUT, ">$makefiles{'cygwin'}"; select OUT;
     print
-    "# Makefile for $project_name under cygwin.\n".
+    "# Makefile for $project_name under Cygwin, MinGW, or Winelib.\n".
     "#\n# This file was created by `mkfiles.pl' from the `Recipe' file.\n".
     "# DO NOT EDIT THIS FILE DIRECTLY; edit Recipe or mkfiles.pl instead.\n";
     # gcc command line option is -D not /D