Automated merge with file:/home/micah/devel/wget/eleven

[wget] / windows / Makefile.in

diff --git a/windows/Makefile.in b/windows/Makefile.in
index 77bc0380e43cc25d8185eafd663d023ec671e580..d6b591d9956657e2089602f9c6b7cc46142572d3 100644 (file)
--- a/windows/Makefile.in
+++ b/windows/Makefile.in
@@ -1,9 +1,9 @@
 # Makefile for `wget' utility
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 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,17 @@
 # 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
+# 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.
 
 #
 # Version: @VERSION@
@@ -25,11 +34,11 @@
 
 SHELL = /bin/sh
 
+top_builddir = ..
+
 srcdir = @srcdir@
 VPATH  = @srcdir@
 
-top_builddir = ..
-
 RM = rm -f
 
 all: