(dist): Resolve `..' in file names.

2000-08-01  Andreas Schwab  <schwab@suse.de>

        * Make-dist (dist): Resolve `..' in file names.

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index b43ccf52fd..9eab0420a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-01  Andreas Schwab  <schwab@suse.de>
+
+        * Make-dist (dist): Resolve `..' in file names.
+
 2000-08-01  Andreas Jaeger  <aj@suse.de>
 
 	* stdio-common/Makefile (distribute): Remove removed files, add
diff --git a/Make-dist b/Make-dist
index 241db4cd3e..4ea23b1c96 100644
--- a/Make-dist
+++ b/Make-dist
@@ -166,7 +166,9 @@ dist: $(..)$(tardir) $(+tardeps)
 	@cd ..; if test -f dist.tar; then c=u; else c=c; fi;	\
 	$(+cmdecho) "cd ..; tar $${c}h$(verbose)f dist.tar ...";	\
 	tar $${c}h$(verbose)f dist.tar \
-	    $(addprefix $(tardir)/$(subdir)/,$(filter-out $<,$^))
+	    $(addprefix $(tardir)/$(subdir)/,$(filter-out $< ../%,$^))	\
+	    $(addprefix $(tardir)/,\
+			$(patsubst ../%,%,$(filter-out $<,$(filter ../%,$^))))
 
 else	# Parent makefile.