[svn] Merge of fix for bugs 20341 and 20410.

[wget] / windows / Makefile.top

diff --git a/windows/Makefile.top b/windows/Makefile.top
index a9025abcf036dfb2a3336cf4d97c6682793ebb59..2f546de4fbef520e6b01971af4150a456681b3a4 100644 (file)
--- a/windows/Makefile.top
+++ b/windows/Makefile.top
@@ -3,7 +3,7 @@
 
 # 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
@@ -72,6 +71,8 @@ bindist: wget.zip
 
 wget.zip: $(SUBDIRS)
        $(RM) wget.zip
-       zip -Djl9 wget.zip AUTHORS COPYING INSTALL 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