bootstrap: preserve permissions of more copied files
authorJim Meyering <meyering@redhat.com>
Tue, 26 Aug 2008 16:43:52 +0000 (18:43 +0200)
committerJim Meyering <meyering@redhat.com>
Tue, 26 Aug 2008 16:43:52 +0000 (18:43 +0200)
* bootstrap (cp_mark_as_generated): Preserve perms of copied files.
Remove a kludge, now that this is fixed.

bootstrap

index faa9bab..a3bee61 100755 (executable)
--- 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'."