diff --git a/Makefile.am b/Makefile.am index 3f9ce0262..0e0ac14ce 100644 --- a/Makefile.am +++ b/Makefile.am @@ -68,35 +68,8 @@ pkgadd: cat LEGAL MITX.txt MPL-1.1.txt > $(srcdir)/packages/Solaris/copyright ; \ cd $(srcdir)/packages/Solaris && $(MAKE) package - - - # -# Build a Cygwin binary tarball -# run 'make cygwinbin' once you've done './configure' and 'make' -# deposits curl-${VERSION}.tar.gz into the packages/Cygwin directory -# installation of this tarball is via cygwin-setup.exe -# - -# tmp dir to build binary-tarball in -CygwinTmp = /tmp/curl-binary-build - -# Cygwin build number (for a new curl rev, start at 1) -CygwinBld = 1 - +# Build a cygwin binary tarball installation file +# resulting .tar.bz2 file will end up at packages/Win32/cygwin cygwinbin: - rm -rf $(CygwinTmp) ; \ - $(MAKE) install prefix="$(CygwinTmp)/usr" - $(mkinstalldirs) $(CygwinTmp)/usr/doc/Cygwin \ - $(CygwinTmp)/usr/doc/$(PACKAGE)-$(VERSION) - cp $(top_srcdir)/packages/Cygwin/README \ - $(CygwinTmp)/usr/doc/Cygwin/$(PACKAGE)-$(VERSION)-$(CygwinBld).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)-$(CygwinBld).tar.bz2 usr - mv $(CygwinTmp)/*.tar.bz2 . && rm -rf $(CygwinTmp) - - - + $(MAKE) -C packages/Win32/cygwin cygwinbin diff --git a/configure.in b/configure.in index abc91383a..17a6da0e8 100644 --- a/configure.in +++ b/configure.in @@ -596,7 +596,7 @@ AC_CONFIG_FILES([Makefile \ tests/data/Makefile \ packages/Makefile \ packages/Win32/Makefile \ - packages/Cygwin/Makefile \ + packages/Win32/cygwin/Makefile \ packages/Linux/Makefile \ packages/Linux/RPM/Makefile \ packages/Linux/RPM/curl.spec \