From f03a67735a3143ff684fc0ddf4d4c4477019f079 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 26 Aug 2008 18:43:52 +0200
Subject: [PATCH] bootstrap: preserve permissions of more copied files

* bootstrap (cp_mark_as_generated): Preserve perms of copied files.
Remove a kludge, now that this is fixed.
---
 bootstrap | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/bootstrap b/bootstrap
index faa9bab..a3bee61 100755
--- a/bootstrap
+++ b/bootstrap
@@ -383,9 +383,13 @@ cp_mark_as_generated()
 
     if test -z "$c1"; then
       cmp -s "$cp_src" "$cp_dst" || {
+	# Copy the file first to get proper permissions if it
+	# doesn't already exist.  Then overwrite the copy.
 	echo "$0: cp -f $cp_src $cp_dst" &&
 	rm -f "$cp_dst" &&
-	sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst"
+	cp "$cp_src" "$cp_dst-t" &&
+	sed "s!$bt_regex/!!g" "$cp_src" > "$cp_dst-t" &&
+	mv -f "$cp_dst-t" "$cp_dst"
       }
     else
       # Copy the file first to get proper permissions if it
@@ -610,7 +614,4 @@ m=gnulib-tests/gnulib.mk
 sed 's,\.\./\.\.,..,g' $m > $m-t
 mv -f $m-t $m
 
-# Make tests executable.
-chmod a+x gnulib-tests/test-*.sh
-
 echo "$0: done.  Now you can run './configure'."
-- 
2.7.4