Updated licensing exception for OpenSSL from the SFLC.

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 4d3213452cfcd9c8e8c75c28d5945d27f60f5b21..9561c5840072ef4e3967c2984c8f1de80aa61af8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2006, 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,18 +12,18 @@
 # 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.
-
-# 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.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# 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.
 
 #
 # Version: @VERSION@
@@ -87,7 +87,7 @@ SUBDIRS = src doc po tests util windows
 # default target
 all: src/config.h Makefile $(SUBDIRS)
 
-unittest: src/config.h Makefile 
+test: src/config.h Makefile src
        cd tests && $(MAKE) $(MAKEDEFS) $@
        
 check: all
@@ -117,7 +117,7 @@ TAGS:
 
 dist: $(srcdir)/configure DISTFILES
        mkdir $(DISTNAME)
-       for d in `$(FIND) . -type d ! -name CVS -a ! -name RCS -print`; do \
+       for d in `$(FIND) . -type d ! -regex '.*/\.svn\(/.*\)?' -print`; do \
                if [ "$$d" != "." -a "$$d" != "./$(DISTNAME)" ]; then \
                        mkdir $(DISTNAME)/$$d; \
                fi; \
@@ -134,7 +134,7 @@ dist: $(srcdir)/configure DISTFILES
 DISTFILES: FORCE
        rm -rf $(DISTNAME)      
        (cd $(srcdir); find . ! -type d -print) \
-       | sed '/\/\(CVS\|RCS\)\//d; /$@/d; /\.tar.*/d; s/^.\///; /^\.$$/d;' \
+       | sed '/\/\.svn\//d; /$@/d; /\.tar.*/d; s/^.\///; /^\.$$/d;' \
        | sort | uniq > $@
 
 #