From 0f55f1467a309da866fb443de970845827853569 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 8 Sep 2006 12:26:34 +0000 Subject: [PATCH] Don't make generated files read-only. That would bother too many people. However, do retain the ability to work when targets are read-only: remove the destination and temporary files before writing them (when generated via sed or echo), or by using the -f option for both cp and mv commands. Suggestion to use -f from Paul Eggert. * modules/alloca-opt, modules/argz, modules/arpa_inet: * modules/byteswap, modules/configmake, modules/fcntl: * modules/fnmatch, modules/getopt, modules/glob, modules/inttypes: * modules/localcharset, modules/netinet_in, modules/poll: * modules/stdbool, modules/stdint, modules/sys_select: * modules/sys_socket, modules/sys_stat, modules/sysexits: --- ChangeLog | 14 ++++++++++++++ modules/alloca-opt | 6 ++---- modules/argz | 6 ++---- modules/arpa_inet | 1 - modules/byteswap | 6 ++---- modules/configmake | 1 - modules/fcntl | 1 - modules/fnmatch | 6 ++---- modules/getopt | 6 ++---- modules/glob | 6 ++---- modules/inttypes | 1 - modules/localcharset | 2 -- modules/netinet_in | 1 - modules/poll | 6 ++---- modules/stdbool | 1 - modules/stdint | 1 - modules/sys_select | 1 - modules/sys_socket | 6 ++---- modules/sys_stat | 1 - modules/sysexits | 6 ++---- 20 files changed, 32 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index f83474518..2ddf4cdce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-09-08 Jim Meyering + + Don't make generated files read-only. That would bother too many + people. However, do retain the ability to work when targets are + read-only: remove the destination and temporary files before writing + them (when generated via sed or echo), or by using the -f option for + both cp and mv commands. Suggestion to use -f from Paul Eggert. + * modules/alloca-opt, modules/argz, modules/arpa_inet: + * modules/byteswap, modules/configmake, modules/fcntl: + * modules/fnmatch, modules/getopt, modules/glob, modules/inttypes: + * modules/localcharset, modules/netinet_in, modules/poll: + * modules/stdbool, modules/stdint, modules/sys_select: + * modules/sys_socket, modules/sys_stat, modules/sysexits: + 2006-09-07 Jim Meyering Fix global typo in last change: use chmod u-w, not chmod u-x. diff --git a/modules/alloca-opt b/modules/alloca-opt index f2cee4d66..ae0084c2a 100644 --- a/modules/alloca-opt +++ b/modules/alloca-opt @@ -19,10 +19,8 @@ EXTRA_DIST += alloca_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. alloca.h: alloca_.h - rm -f $@-t $@ - cp $(srcdir)/alloca_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/alloca_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += alloca.h alloca.h-t Include: diff --git a/modules/argz b/modules/argz index e9a5f3907..63a6a29cd 100644 --- a/modules/argz +++ b/modules/argz @@ -18,10 +18,8 @@ EXTRA_DIST += argz_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. argz.h: argz_.h - rm -f $@-t $@ - cp $(srcdir)/argz_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/argz_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += argz.h argz.h-t Include: diff --git a/modules/arpa_inet b/modules/arpa_inet index 6e44f1474..cbbae09fe 100644 --- a/modules/arpa_inet +++ b/modules/arpa_inet @@ -19,7 +19,6 @@ arpa/inet.h: test -d arpa || mkdir arpa rm -f $@-t $@ echo '#include ' >$@-t - chmod a-w $@-t mv $@-t $@ MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t MOSTLYCLEANDIRS += arpa diff --git a/modules/byteswap b/modules/byteswap index dd7d424fd..3f50ab600 100644 --- a/modules/byteswap +++ b/modules/byteswap @@ -17,10 +17,8 @@ EXTRA_DIST += byteswap_.h # We need the following in order to create when the system # doesn't have one. byteswap.h: byteswap_.h - rm -f $@-t $@ - cp $(srcdir)/byteswap_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/byteswap_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += byteswap.h byteswap.h-t Include: diff --git a/modules/configmake b/modules/configmake index 2ffe57b2b..77903c3ed 100644 --- a/modules/configmake +++ b/modules/configmake @@ -50,7 +50,6 @@ configmake.h: Makefile echo '#define MANDIR "$(mandir)"'; \ echo '#define MANEXT "$(manext)"'; \ :) | sed '/""/d' >$@-t - chmod a-w $@-t mv $@-t $@ BUILT_SOURCES += configmake.h CLEANFILES += configmake.h configmake.h-t diff --git a/modules/fcntl b/modules/fcntl index a12648f50..357bdfa31 100644 --- a/modules/fcntl +++ b/modules/fcntl @@ -22,7 +22,6 @@ fcntl.h: fcntl_.h rm -f $@-t $@ sed -e 's|@''ABSOLUTE_FCNTL_H''@|$(ABSOLUTE_FCNTL_H)|g' \ < $(srcdir)/fcntl_.h > $@-t - chmod a-w $@-t mv $@-t $@ MOSTLYCLEANFILES += fcntl.h fcntl.h-t diff --git a/modules/fnmatch b/modules/fnmatch index 8352796b9..83bd17e7c 100644 --- a/modules/fnmatch +++ b/modules/fnmatch @@ -22,10 +22,8 @@ EXTRA_DIST += fnmatch_.h fnmatch_loop.c # We need the following in order to create when the system # doesn't have one that supports the required API. fnmatch.h: fnmatch_.h - rm -f $@-t $@ - cp $(srcdir)/fnmatch_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/fnmatch_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t Include: diff --git a/modules/getopt b/modules/getopt index 8acf0fbfa..ee754bc12 100644 --- a/modules/getopt +++ b/modules/getopt @@ -22,10 +22,8 @@ EXTRA_DIST += getopt_.h getopt_int.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. getopt.h: getopt_.h - rm -f $@-t $@ - cp $(srcdir)/getopt_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/getopt_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += getopt.h getopt.h-t Include: diff --git a/modules/glob b/modules/glob index 8df7d5eb9..2dc8ce1d6 100644 --- a/modules/glob +++ b/modules/glob @@ -30,10 +30,8 @@ EXTRA_DIST += glob_.h glob-libc.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. glob.h: glob_.h - rm -f $@-t $@ - cp $(srcdir)/glob_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/glob_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += glob.h glob.h-t Include: diff --git a/modules/inttypes b/modules/inttypes index ba71bc2f9..0492ac1b4 100644 --- a/modules/inttypes +++ b/modules/inttypes @@ -32,7 +32,6 @@ inttypes.h: inttypes_.h -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ < $(srcdir)/inttypes_.h > $@-t - chmod a-w $@-t mv $@-t $@ MOSTLYCLEANFILES += inttypes.h inttypes.h-t diff --git a/modules/localcharset b/modules/localcharset index 8075a2ca8..596755330 100644 --- a/modules/localcharset +++ b/modules/localcharset @@ -61,14 +61,12 @@ uninstall-local: all-local charset.alias: config.charset rm -f t-$@ $@ $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ - chmod a-w t-$@ mv t-$@ $@ SUFFIXES += .sed .sin .sin.sed: rm -f t-$@ $@ sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ - chmod a-w t-$@ mv t-$@ $@ CLEANFILES += charset.alias ref-add.sed ref-del.sed diff --git a/modules/netinet_in b/modules/netinet_in index faa01d626..f65dbcc4f 100644 --- a/modules/netinet_in +++ b/modules/netinet_in @@ -19,7 +19,6 @@ netinet/in.h: test -d netinet || mkdir netinet rm -f $@-t $@ echo '#include ' >$@-t - chmod a-w $@-t mv $@-t $@ MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t MOSTLYCLEANDIRS += netinet diff --git a/modules/poll b/modules/poll index 87454c5c6..9784c4341 100644 --- a/modules/poll +++ b/modules/poll @@ -18,10 +18,8 @@ EXTRA_DIST += poll_.h # We need the following in order to create when the system # doesn't have one. poll.h: poll_.h - rm -f $@-t $@ - cp $(srcdir)/poll_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/poll_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += poll.h poll.h-t Include: diff --git a/modules/stdbool b/modules/stdbool index faa2501f6..51fc36fc6 100644 --- a/modules/stdbool +++ b/modules/stdbool @@ -20,7 +20,6 @@ EXTRA_DIST += stdbool_.h stdbool.h: stdbool_.h rm -f $@-t $@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t - chmod a-w $@-t mv $@-t $@ MOSTLYCLEANFILES += stdbool.h stdbool.h-t diff --git a/modules/stdint b/modules/stdint index 57abf0e47..d7dd07331 100644 --- a/modules/stdint +++ b/modules/stdint @@ -47,7 +47,6 @@ stdint.h: stdint_.h -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ < $(srcdir)/stdint_.h > $@-t - chmod a-w $@-t mv $@-t $@ MOSTLYCLEANFILES += stdint.h stdint.h-t diff --git a/modules/sys_select b/modules/sys_select index 019b6debf..80dc8faca 100644 --- a/modules/sys_select +++ b/modules/sys_select @@ -19,7 +19,6 @@ sys/select.h: test -d sys || mkdir sys rm -f $@-t $@ echo '#include ' >$@-t - chmod a-w $@-t mv $@-t $@ MOSTLYCLEANFILES += sys/select.h sys/select.h-t MOSTLYCLEANDIRS += sys diff --git a/modules/sys_socket b/modules/sys_socket index 128f0cbd8..a27b87ca6 100644 --- a/modules/sys_socket +++ b/modules/sys_socket @@ -19,10 +19,8 @@ EXTRA_DIST += socket_.h # doesn't have one that works with the given compiler. sys/socket.h: socket_.h test -d sys || mkdir sys - rm -f $@-t $@ - cp $(srcdir)/socket_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/socket_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t MOSTLYCLEANDIRS += sys diff --git a/modules/sys_stat b/modules/sys_stat index 33ff8e152..4fc957ffc 100644 --- a/modules/sys_stat +++ b/modules/sys_stat @@ -22,7 +22,6 @@ sys/stat.h: stat_.h rm -f $@-t $@ sed -e 's|@''ABSOLUTE_SYS_STAT_H''@|$(ABSOLUTE_SYS_STAT_H)|g' \ < $(srcdir)/stat_.h > $@-t - chmod a-w $@-t mv $@-t $@ MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t MOSTLYCLEANDIRS += sys diff --git a/modules/sysexits b/modules/sysexits index c974a240a..2872e3645 100644 --- a/modules/sysexits +++ b/modules/sysexits @@ -17,10 +17,8 @@ EXTRA_DIST += sysexit_.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. sysexits.h: sysexit_.h - rm -f $@-t $@ - cp $(srcdir)/sysexit_.h $@-t - chmod a-w $@-t - mv $@-t $@ + cp -f $(srcdir)/sysexit_.h $@-t + mv -f $@-t $@ MOSTLYCLEANFILES += sysexits.h sysexits.h-t Include: -- 2.11.0