[mq]: cfg-mk

[wget] / windows / Makefile.top.bor

diff --git a/windows/Makefile.top.bor b/windows/Makefile.top.bor
index 6667a4ff405403a2712859540a000fbfba38d9f2..1b69fd4cd361911e9d3f3009e192816655e6f104 100644 (file)
--- a/windows/Makefile.top.bor
+++ b/windows/Makefile.top.bor
@@ -1,5 +1,6 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997, 2004, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2004, 2007, 2008, 2009 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
@@ -14,15 +15,16 @@
 # You should have received a copy of the GNU General Public License
 # 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
-# OpenSSL project's "OpenSSL" library (or with modified versions of it
-# that use the same license as the "OpenSSL" library), and distribute
-# the linked executables.  You must obey the GNU General Public License
-# in all respects for all of the code used other than "OpenSSL".  If you
-# modify this file, you may extend this exception to your version of the
-# file, but you are not obligated to do so.  If you do not wish to do
-# so, delete this exception statement from your version.
+# Additional permission under GNU GPL version 3 section 7
+
+# If you modify this program, or any covered work, by linking or
+# combining it with the OpenSSL project's OpenSSL library (or a
+# modified version of that library), containing parts covered by the
+# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+# grants you additional permission to convey the resulting work.
+# Corresponding Source for a non-source form of such a combination
+# shall include the source code for the parts of OpenSSL used as well
+# as that of the covered work.
 
 RM = -del
 CP = copy
@@ -35,7 +37,7 @@ SUBDIRS = src doc #util
 # default target
 all: Makefile $(SUBDIRS)
 
-$(SUBDIRS): 
+$(SUBDIRS):
        cd $@
        $(MAKEDIR)\$(MAKE)
        cd ..
@@ -71,7 +73,7 @@ wget.zip: $(SUBDIRS)
        $(RM) wget.zip
        $(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 -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