aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-03-22 22:24:23 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-03-22 22:24:23 +0000
commit651c8d3bc4e1e6da6868acba730021e4cb7d3a41 (patch)
tree8ce1b588b9ad3b6f6ab239bd863fe43e1def89bf
parenta8a946d71d6f9b5f463dc486698a37abe529ff4e (diff)
Kevin Roth's updates to handle a new requirement from the Cygwin folks to
package man and doc files in a slightly different location.
-rw-r--r--packages/Win32/cygwin/Makefile.am35
-rw-r--r--packages/Win32/cygwin/README25
2 files changed, 35 insertions, 25 deletions
diff --git a/packages/Win32/cygwin/Makefile.am b/packages/Win32/cygwin/Makefile.am
index 33afc996d..936f1b59f 100644
--- a/packages/Win32/cygwin/Makefile.am
+++ b/packages/Win32/cygwin/Makefile.am
@@ -23,34 +23,34 @@ cygwinbin:
$(MAKE) -C $(top_builddir) DESTDIR=$(cygwintmp) install-strip
# $(STRIP) $(cygwintmp)/usr/bin/cygcurl-?.dll
$(mkinstalldirs) \
- $(cygwintmp)/usr/doc/Cygwin \
- $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) \
- $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/libcurl \
- $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples \
- $(cygwintmp)-dev/usr/man
+ $(cygwintmp)$(datadir)/doc/Cygwin \
+ $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) \
+ $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/libcurl \
+ $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples \
+ $(cygwintmp)-dev$(mandir)
#
# copy some files into the binary install dir
cp $(srcdir)/README \
- $(cygwintmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
+ $(cygwintmp)$(datadir)/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CYGBUILD).README
cd $(top_srcdir) ; cp CHANGES COPYING README RELEASE-NOTES docs/* \
- $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) ; pwd
- cd $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION) ; rm *.1 Makefile*
+ $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) ; pwd
+ cd $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION) ; rm *.1 Makefile*
#
# copy some files into the -dev install dir, remove some from binary
cp $(top_srcdir)/docs/libcurl/*.html \
- $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/libcurl
+ $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/libcurl
cp $(top_srcdir)/docs/examples/* \
- $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples
- rm $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples/Makefile*
+ $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples
+ rm $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples/Makefile*
cp $(top_srcdir)/docs/examples/Makefile.example \
- $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)/examples
- mv $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)/BINDINGS \
- $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)
- mv $(cygwintmp)/usr/doc/$(PACKAGE)-$(VERSION)/INTERNALS \
- $(cygwintmp)-dev/usr/doc/$(PACKAGE)-$(VERSION)
+ $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)/examples
+ mv $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION)/BINDINGS \
+ $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)
+ mv $(cygwintmp)$(datadir)/doc/$(PACKAGE)-$(VERSION)/INTERNALS \
+ $(cygwintmp)-dev$(datadir)/doc/$(PACKAGE)-$(VERSION)
mv $(cygwintmp)/usr/include $(cygwintmp)-dev/usr
mv $(cygwintmp)/usr/lib $(cygwintmp)-dev/usr
- mv $(cygwintmp)/usr/man/man3 $(cygwintmp)-dev/usr/man
+ mv $(cygwintmp)$(mandir)/man3 $(cygwintmp)-dev$(mandir)
#
# create both tar files, and delete tmp folders
cd $(cygwintmp) ; tar cjf \
@@ -60,4 +60,3 @@ cygwinbin:
cd $(cygwintmp)-dev ; tar cjf \
$(PACKAGE)-devel-$(VERSION)-$(CYGBUILD).tar.bz2 usr
mv $(cygwintmp)-dev/*.tar.bz2 . && rm -rf $(cygwintmp)-dev
-
diff --git a/packages/Win32/cygwin/README b/packages/Win32/cygwin/README
index 47d4f0568..441af4aaf 100644
--- a/packages/Win32/cygwin/README
+++ b/packages/Win32/cygwin/README
@@ -30,14 +30,17 @@ Build Instructions (to recompile from the cygwin source tarball):
Download the source (either the official release or the cygwin version),
unpack it (done for you if using setup.exe), then:
- $ ./configure --prefix=/usr
+ $ ./configure --prefix=/usr --mandir=/usr/share/man # (*)
$ make
$ make test # optional
- $ make install # (*)
+ $ make install # (**)
- (*) LibTool 1.4.2 had a bug related to cygwin's use of ".exe" extensions,
+ (*) The Cygwin project now (as of sometime in 2003) prefers man pages
+ within /usr/share/man, as opposed to the default /usr/man.
+
+ (**) 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
+ http://mail.gnu.org/pipermail/libtool/2001-September/005549.html
The copy of ltmain.sh that is distributed with cURL includes this patch.
As of curl 7.9.1, the official source compiles (under Cygwin) and tests
@@ -46,7 +49,7 @@ Build Instructions (to recompile from the cygwin source tarball):
---NO SSL RELEASE---
Same as standard, except for the configure step, which changes to:
- $ ./configure --prefix=/usr --without-ssl
+ $ ./configure --prefix=/usr --mandir=/usr/share/man --without-ssl
NOTE: the standard release is what is available via Cygwin's setup.exe;
the no-ssl release is only available from the curl website
@@ -85,6 +88,7 @@ Packaging Instructions:
$ tar cfj curl-7.9-1-src.tar.bz2 curl-7.9-1
---SETUP.HINT---
+ @ curl
sdesc: "a client that groks URLs"
ldesc: "Curl is a tool for transferring files with URL syntax,
supporting FTP, FTPS, HTTP, HTTPS, GOPHER, TELNET, DICT, FILE
@@ -92,12 +96,19 @@ Packaging Instructions:
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."
- category: Web Libs
+ category: Web
requires: cygwin openssl
+ @ curl-devel
+ sdesc: "(lib)cURL headers, static libraries, developer docs and samples"
+ ldesc: "curl-devel is the developer-oriented (non-run-time) parts
+ of the cURL package. It includes header files, static libraries,
+ example source code snippets, and the libcurl man pages."
+ category: Web Libs Devel
+ requires: cygwin openssl curl
+
Cygwin port maintained by:
Kevin Roth <kproth @ users . sourceforge . net>
Questions about cURL should be directed to curl-users@cool.haxx.se.
Questions about this cygwin package go to cygwin@cygwin.com.
-