Mimic Paul Eggert's changes to Autoconf.

* Makefile.am (automake, aclocal): Use `chmod a-w', not `chmod -w'.
* lib/Automake/Makefile.am (Config.pm): Likewise.
* m4/Makefile.am ($(top_srcdir)/m4/amversion.m4): Likewise.

diff --git a/ChangeLog b/ChangeLog
index d8a2be0..a65598e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-01-05  Alexandre Duret-Lutz  <adl@gnu.org>
 
+       Mimic Paul Eggert's changes to Autoconf.
+       * Makefile.am (automake, aclocal): Use `chmod a-w', not `chmod -w'.
+       * lib/Automake/Makefile.am (Config.pm): Likewise.
+       * m4/Makefile.am ($(top_srcdir)/m4/amversion.m4): Likewise.
+
        * lib/am/inst-vars.am: New file, define am__vpath_adj_setup,
        am__vpath_adj, and am__strip_dir.
        * lib/am/Makefile.am (dist_am_DATA): Add inst-vars.am.

diff --git a/Makefile.am b/Makefile.am
index 45bd7ff..d2feb69 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 ## Makefile for Automake.
 
-## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003
+## Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -69,19 +69,19 @@ do_subst = sed \
 
 ## These files depend on Makefile so they are rebuilt if $(VERSION),
 ## $(datadir) or other do_subst'ituted variables change.
-## Use chmod -w to prevent people from editing the wrong file by accident.
+## Use chmod a-w to prevent people from editing the wrong file by accident.
 automake: automake.in Makefile
        rm -f $@ $@.tmp
        $(do_subst) $(srcdir)/automake.in >$@.tmp
        chmod +x $@.tmp
-       chmod -w $@.tmp
+       chmod a-w $@.tmp
        mv -f $@.tmp $@
 
 aclocal: aclocal.in Makefile
        rm -f $@ $@.tmp
        $(do_subst) $(srcdir)/aclocal.in >$@.tmp
        chmod +x $@.tmp
-       chmod -w $@.tmp
+       chmod a-w $@.tmp
        mv -f $@.tmp $@
 
 ## The master location for INSTALL is lib/INSTALL.

diff --git a/Makefile.in b/Makefile.in
index 1160b4a..78b3632 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -604,14 +604,14 @@ automake: automake.in Makefile
        rm -f $@ $@.tmp
        $(do_subst) $(srcdir)/automake.in >$@.tmp
        chmod +x $@.tmp
-       chmod -w $@.tmp
+       chmod a-w $@.tmp
        mv -f $@.tmp $@
 
 aclocal: aclocal.in Makefile
        rm -f $@ $@.tmp
        $(do_subst) $(srcdir)/aclocal.in >$@.tmp
        chmod +x $@.tmp
-       chmod -w $@.tmp
+       chmod a-w $@.tmp
        mv -f $@.tmp $@
 
 INSTALL: lib/INSTALL

diff --git a/bootstrap b/bootstrap
index aae8497..095fc92 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -2,7 +2,7 @@
 
 # This script helps bootstrap automake, when checked out from CVS.
 #
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004  Free Software Foundation, Inc.
 # written by Pavel Roskin <proski@gnu.org> September 2002
 #
 # This program is free software; you can redistribute it and/or modify
@@ -102,7 +102,7 @@ dosubst ()
       -e "s%@datadir@%$datadir%g" \
       -e "s%@configure_input@%Generated from $in; do not edit by hand.%g" \
       $1 > $2
-  chmod -w $2
+  chmod a-w $2
 }
 
 

diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am
index c248d7c..da2de3d 100644 (file)
--- a/lib/Automake/Makefile.am
+++ b/lib/Automake/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to create Makefile.in
 
-## Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003, 2004  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
@@ -60,12 +60,12 @@ do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \
 
 ## This file depend on Makefile so it is rebuilt if $(VERSION),
 ## $(datadir) or other do_subst'ituted variables change.
-## Use chmod -w to prevent people from editing the wrong file by accident.
+## Use chmod a-w to prevent people from editing the wrong file by accident.
 Config.pm: Config.in Makefile
        rm -f Config.tmp Config.pm
        $(do_subst) $(srcdir)/Config.in >Config.tmp
        chmod +x Config.tmp
-       chmod -w Config.tmp
+       chmod a-w Config.tmp
        mv -f Config.tmp Config.pm
 
 EXTRA_DIST = Config.in

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 84ff86c..f179f03 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -496,7 +496,7 @@ Config.pm: Config.in Makefile
        rm -f Config.tmp Config.pm
        $(do_subst) $(srcdir)/Config.in >Config.tmp
        chmod +x Config.tmp
-       chmod -w Config.tmp
+       chmod a-w Config.tmp
        mv -f Config.tmp Config.pm
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/m4/Makefile.am b/m4/Makefile.am
index 263b52c..c4970cb 100644 (file)
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -2,7 +2,7 @@
 
 ## Makefile for Automake m4.
 
-## Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003
+## Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004
 ## Free Software Foundation, Inc.
 
 ## This program is free software; you can redistribute it and/or modify
@@ -69,5 +69,5 @@ $(top_srcdir)/m4/amversion.m4: $(srcdir)/amversion.in
            -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
            -e "s,[@]configure_input[@],Generated from amversion.in; do not edit by hand.,g" \
            $(srcdir)/amversion.in > $@t
-       chmod -w $@t
+       chmod a-w $@t
        mv -f $@t $@

diff --git a/m4/Makefile.in b/m4/Makefile.in
index 7b9d568..cd3dfaa 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -343,7 +343,7 @@ $(top_srcdir)/m4/amversion.m4: $(srcdir)/amversion.in
            -e 's,[@]APIVERSION[@],$(APIVERSION),g' \
            -e "s,[@]configure_input[@],Generated from amversion.in; do not edit by hand.,g" \
            $(srcdir)/amversion.in > $@t
-       chmod -w $@t
+       chmod a-w $@t
        mv -f $@t $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.