From aec7773c94d61d2b47632b9394abbc78417afa21 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Thu, 29 Sep 2011 11:37:47 +0000 Subject: [PATCH] The commands of the $(TOOLS_ZIP) rule include copying of two subtrees from the source tree (asm/ and classes/). The commands of the $(TOOLS_ZIP) rule include copying of two subtrees from the source tree (asm/ and classes/). If the source tree is read-only, the use of cp's -p option here prevents the trees from getting deleted later in the rule if they (or at least their directories) don't get marked writable. Committed as obvious. libjava/classpath/ 2011-09-29 Jan Beulich * tools/Makefile.am (TOOLS_ZIP): Make writable the copied subtrees asm/ and classes/. * tools/Makefile.in: Re-generate. From-SVN: r179343 --- libjava/classpath/ChangeLog | 6 ++++++ libjava/classpath/tools/Makefile.am | 1 + libjava/classpath/tools/Makefile.in | 1 + 3 files changed, 8 insertions(+) diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 75217a47f7b2..0ba40b04c356 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,9 @@ +2011-09-29 Jan Beulich + + * tools/Makefile.am (TOOLS_ZIP): Make writable the copied subtrees + asm/ and classes/. + * tools/Makefile.in: Re-generate. + 2010-06-03 Andrew John Hughes * examples/gnu/classpath/examples/CORBA/NamingService/Demo.java, diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 44489c89afd2..f7ad91c90693 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -371,6 +371,7 @@ endif ## BEGIN GCJ LOCAL cp -pR $(srcdir)/asm . cp -pR $(srcdir)/classes . + find asm classes -type d -exec chmod u+w \{\} \; if [ -d asm/.svn ]; then \ find asm classes -depth -type d -name .svn -exec rm -rf \{\} \;; \ fi diff --git a/libjava/classpath/tools/Makefile.in b/libjava/classpath/tools/Makefile.in index adb8c09b7d6d..d82fac6d9ae2 100644 --- a/libjava/classpath/tools/Makefile.in +++ b/libjava/classpath/tools/Makefile.in @@ -1425,6 +1425,7 @@ $(TOOLS_ZIP): $(ALL_TOOLS_FILES) done cp -pR $(srcdir)/asm . cp -pR $(srcdir)/classes . + find asm classes -type d -exec chmod u+w \{\} \; if [ -d asm/.svn ]; then \ find asm classes -depth -type d -name .svn -exec rm -rf \{\} \;; \ fi