6 files changed, 99 insertions, 37 deletions
diff --git a/packages/Cygwin/Makefile.am b/packages/Cygwin/Makefile.am
deleted file mode 100644
index c0321c890..000000000
--- a/packages/Cygwin/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-EXTRA_DIST = README
-
diff --git a/packages/Cygwin/README b/packages/Cygwin/README
deleted file mode 100644
index 002d6a63b..000000000
--- a/packages/Cygwin/README
+++ /dev/null
@@ -1,34 +0,0 @@
-cURL (as of 7.9.1) builds completely OOTB. The Cygwin specific files
-(README is the only one so far) are located in a non-standard location:
- <srctop>/packages/Cygwin/
-
-This release (v7.9) includes the patch needed in CYGWIN-PATCHES,
-however future releases should eliminate this directory.
-
-
-Direct Dependencies:
-  OpenSSL 0.9.6b
-
-Canonical Homepage:
-  http://curl.haxx.se/
-
-Canonical Download:
-  http://curl.haxx.se/download.html
-
-
-Build Instructions:
-
-  unpack curl-<ver>-X-src.tar.bz2
-  cd curl-<ver>
-  ./configure --prefix=/usr 
-  make
-  (optionally) make test (*)
-  make install (**)
-
-  (*) until v7.9.1, 'make test' requires Cygwin's mounts set to binmode / Unix
-  (**) if you need to bootstrap, make install will require libtool 1.4.3
-       (which contains a patch related to the ".exe" extension on curl.exe
-
-
-Cygwin "port" maintained by: Kevin Roth <kproth at bigfoot dot com>
-
diff --git a/packages/Makefile.am b/packages/Makefile.am
index d07884e62..d82908ce4 100644
--- a/packages/Makefile.am
+++ b/packages/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS = Win32 Linux Solaris Cygwin
+SUBDIRS = Win32 Linux Solaris
 
 EXTRA_DIST = README
diff --git a/packages/Win32/Makefile.am b/packages/Win32/Makefile.am
index 952fde6ed..93350ea13 100644
--- a/packages/Win32/Makefile.am
+++ b/packages/Win32/Makefile.am
@@ -1 +1,3 @@
+SUBDIRS = cygwin
+
 EXTRA_DIST = README
diff --git a/packages/Win32/cygwin/Makefile.am b/packages/Win32/cygwin/Makefile.am
new file mode 100644
index 000000000..885480ed2
--- /dev/null
+++ b/packages/Win32/cygwin/Makefile.am
@@ -0,0 +1,37 @@
+EXTRA_DIST = README
+
+#
+# Build a Cygwin binary tar ball
+#
+# Read the README file for details on using this Makefile
+#
+# NOTE: As I'm not particularly familiar with Makefiles, this was the
+#  best I could come up with. It should probably be enhanced someday 
+#  to actually use the correct target and pre-requisite names, etc...
+#  If anyone else wants to volunteer, feel free ;-)
+#
+
+# 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
+
+# temp dir for use while building the tarball (fully-qualified)
+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 \
+	  $(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 \
+	  $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)
+	cd $(cygwintmp) ; \
+	  tar cjf $(PACKAGE)-$(VERSION)-$(CYGBUILD).tar.bz2 usr
+	mv $(cygwintmp)/$(PACKAGE)-$(VERSION)-$(CYGBUILD).tar.bz2 . \
+	  && rm -rf $(cygwintmp)
diff --git a/packages/Win32/cygwin/README b/packages/Win32/cygwin/README
new file mode 100644
index 000000000..72fb5f463
--- /dev/null
+++ b/packages/Win32/cygwin/README
@@ -0,0 +1,59 @@
+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/
+
+
+Direct Dependencies:
+  OpenSSL 0.9.6b (cURL can be built without SSL support: configure --without-ssl)
+
+
+Canonical Homepage:
+  http://curl.haxx.se/
+
+
+Canonical Download:
+  http://curl.haxx.se/download.html
+
+
+Build Instructions:
+  Download the source, move it to a location of your choosing, and then:
+
+  $ tar xjf curl-<ver>-X-src.tar.bz2
+  $ cd curl-<ver>-X
+  $ ./configure --prefix=/usr 
+  $ make
+  $ make test    # optional, requires perl
+  $ make install # (*)
+
+  (*) LibTool 1.4.2 had a bug related to cygwin's use of ".exe" extensions,
+      such that "make install" blew up at curl.exe. See this URL for details:
+        http://mail.gnu.org/pipermail/libtool/2001-September/005549.html
+      The copy of ltmain.sh that is distributed with cURL includes this patch.
+
+
+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:
+
+  $ cd curl-<ver>-X
+  $ CYGBUILD=X make cygwinbin
+
+  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.
+
+  Assuming everything worked properly, you'll find your cygwin
+  binary tarball in the curl-<ver>-X/packages/Win32/cygwin/ directory.
+
+
+Cygwin port maintained by: 
+  Kevin Roth <kproth at bigfoot dot com>