Merged with eleven for Gisle's mswindows.c patch.

[wget] / windows / Makefile.top.bor

diff --git a/windows/Makefile.top.bor b/windows/Makefile.top.bor
index e264f6c70f0173e6f946eb03afe7c46aa18b8957..6667a4ff405403a2712859540a000fbfba38d9f2 100644 (file)
--- a/windows/Makefile.top.bor
+++ b/windows/Makefile.top.bor
@@ -1,9 +1,9 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997, 2004 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2004, 2007 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -12,8 +12,7 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # In addition, as a special exception, the Free Software Foundation
 # gives permission to link the code of its release of Wget with the
@@ -38,7 +37,7 @@ all: Makefile $(SUBDIRS)
 
 $(SUBDIRS): 
        cd $@
-       $(MAKE)
+       $(MAKEDIR)\$(MAKE)
        cd ..
 
 # install everything
@@ -61,15 +60,18 @@ realclean-top: distclean-top
 
 clean-recursive distclean-recursive realclean-recursive:
        cd src
-       $(MAKE) $(@:-recursive=)
-       cd ..\\doc
-       $(MAKE) $(@:-recursive=)
+       $(MAKEDIR)\$(MAKE) $(@:-recursive=)
+       cd ..\doc
+       $(MAKEDIR)\$(MAKE) $(@:-recursive=)
        cd ..
 
 bindist: wget.zip
 
 wget.zip: $(SUBDIRS)
        $(RM) wget.zip
-       zip -Djl9 wget.zip AUTHORS COPYING INSTALL MACHINES MAILING-LIST NEWS README doc/sample.wgetrc
-       zip -Dj9 wget.zip src/wget.exe doc/wget.hlp
+       $(RM) cacert.pem
+       src\wget http://curl.haxx.se/ca/cacert.pem
+       zip -Djl9 wget.zip AUTHORS COPYING INSTALL MAILING-LIST NEWS README doc/sample.wgetrc 
+       zip -Dj9 wget.zip src/wget.exe doc/wget.hlp cacert.pem 
+       zip -Dj9 wget.zip c:\openssl\bin\libeay32.dll c:\openssl\bin\ssleay32.dll c:\openssl\bin\msvcr80.dll