Merge with mainline

[wget] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index b76228c0bbc1b44b51abc8922e1cd6d709d3c015..a680164e7334739afc18c7a66c4ddf6aa3935257 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # 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
@@ -86,7 +86,7 @@ SUBDIRS = src doc po tests util windows
 # default target
 all: src/config.h Makefile $(SUBDIRS)
 
-test: src/config.h Makefile 
+test: src/config.h Makefile src
        cd tests && $(MAKE) $(MAKEDEFS) $@
        
 check: all
@@ -116,7 +116,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; \
@@ -133,7 +133,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 > $@
 
 #