Kevin Roth updates

2 files changed, 18 insertions, 20 deletions

diff --git a/packages/Win32/cygwin/Makefile.am b/packages/Win32/cygwin/Makefile.am
index 885480ed2..ef1a88d51 100644
--- a/packages/Win32/cygwin/Makefile.am
+++ b/packages/Win32/cygwin/Makefile.am
@@ -12,21 +12,18 @@ EXTRA_DIST = README
 #
 
 # Cygwin build number (default to "1")
-# NOTE: I tried using this to default CYGBUILD to 1, but couldn't make it work)
-#ifndef CYGBUILD
-#  CYGBUILD = 1
-#endif
+CYGBUILD ?= 1
 
-# temp dir for use while building the tarball (fully-qualified)
+# Cygwin tarball build dir (fully-qualified name, gets deleted when done)
 cygwintmp := $(CURDIR)/cygwinbin-builddir
 
 cygwinbin:
 	rm -rf $(cygwintmp)
-	@(echo Installing to the temporary build dir...)
 	$(MAKE) -C $(top_builddir) install prefix=$(cygwintmp)/usr
 	$(mkinstalldirs) $(cygwintmp)/usr/doc/Cygwin \
 	                 $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)
-	cp $(top_srcdir)/packages/Win32/cygwin/README \
+	cd $(top_srcdir); \
+	  cp packages/Win32/cygwin/README \
 	  $(cygwintmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
 	cd $(top_srcdir) ; \
 	  cp CHANGES LEGAL MPL-1.1.txt README docs/FAQ docs/FEATURES docs/TODO \
diff --git a/packages/Win32/cygwin/README b/packages/Win32/cygwin/README
index 72fb5f463..4ef06e1fe 100644
--- a/packages/Win32/cygwin/README
+++ b/packages/Win32/cygwin/README
@@ -1,19 +1,20 @@
-Curl is a tool for transferring files with URL syntax, supporting
- FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. 
- Curl supports HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos,
- HTTP form based upload, proxies, cookies, user+password authentication, 
- file transfer resume, http proxy tunneling and a busload of other useful tricks.
+Curl is a tool for transferring files with URL syntax, supporting FTP, FTPS,
+ HTTP, HTTPS, GOPHER, TELNET, DICT, FILE and LDAP. Curl supports HTTPS 
+ certificates, HTTP POST, HTTP PUT, FTP uploading, kerberos, HTTP form based
+ upload, proxies, cookies, user+password authentication, file transfer resume,
+ http proxy tunneling and a busload of other useful tricks.
  See /usr/doc/curl-<version>/FEATURES for more info.
 
 cURL (as of 7.9.1) builds 100% cleanly OOTB.
 
 The Cygwin specific source files (README and a Makefile for
  building binary tarballs) are not in a CYGWIN-PATCHES directory.
- They are at: <srctop>/packages/Win32/cygwin/
+They are at: <srctop>/packages/Win32/cygwin/
 
 
 Direct Dependencies:
-  OpenSSL 0.9.6b (cURL can be built without SSL support: configure --without-ssl)
+  OpenSSL 0.9.6b 
+  (*) cURL can be built without SSL support:  ./configure --without-ssl
 
 
 Canonical Homepage:
@@ -41,16 +42,16 @@ Build Instructions:
 
 
 Packaging Instructions:
-  To create a new binary tarball for cygwin's setup.exe, you must first do a clean
-  build (see above). The 'make install' step is optional of course. Then do:
+  To create a new binary tarball for cygwin's setup.exe, the first step is to
+  do a clean build (./configure and make). The 'make install' step is optional.
+  Then do:
 
   $ cd curl-<ver>-X
-  $ CYGBUILD=X make cygwinbin
+  $ make cygwinbin CYGBUILD=X 
 
   where "X" is the cygwin release number (e.g. the "-1" in curl-7.9.3-1).
-  I had some difficulty figuring out how to default CYGBUILD to "1", this may
-  get fixed in a future release.
-
+  If you leave off "CYGBUILD=X", X defaults to 1.
+  
   Assuming everything worked properly, you'll find your cygwin
   binary tarball in the curl-<ver>-X/packages/Win32/cygwin/ directory.