X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=Makefile.am;h=27b43549046187e8c306286d0787d79eb57e5fae;hp=98639ea3d918f6bf237d9764cfd7135ffc5f0e82;hb=aec2fac89b051dbde2a2dbd2414d73fcce508ea9;hpb=b7c6c35be5930695cc64ef2d54d6f421f8511553

diff --git a/Makefile.am b/Makefile.am
index 98639ea3..27b43549 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 # 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.
+# Copyright (C) 1995, 1996, 1997, 2006, 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
@@ -15,31 +15,37 @@
 # 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.
 
 #
 # Version: @VERSION@
 #
 
+
+# We can't help that installing wget.info leaves /usr/share/info/dir
+# around, and we need to prevent uninstallation of the possibly
+# previously-existing /etc/wgetrc.
+distuninstallcheck_listfiles = find . -type f | \
+			       grep -Ev '(/share/info/dir|/etc/wgetrc)$$'
+
 # Search for macros in the m4 subdirectory:
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I md5/m4
 
 # subdirectories in the distribution
-SUBDIRS = lib src doc po tests util windows
-
-test: all
-	cd tests && $(MAKE) $(AM_MAKEFLAGS) $@
+SUBDIRS = lib md5 src doc po tests util windows
 
 EXTRA_DIST = ChangeLog.README configure.bat MAILING-LIST \
-	     msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
-	     msdos/Makefile.WC ABOUT-NLS
+             msdos/ChangeLog msdos/config.h msdos/Makefile.DJ \
+             msdos/Makefile.WC ABOUT-NLS autogen.sh \
+             build-aux/build_info.pl
 
 CLEANFILES = *~ *.bak $(DISTNAME).tar.gz