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  <jbeulich@suse.com>

	* tools/Makefile.am (TOOLS_ZIP): Make writable the copied subtrees
	asm/ and classes/.
	* tools/Makefile.in: Re-generate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@179343 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 75217a4..0ba40b0 100644 (file)
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-29  Jan Beulich  <jbeulich@suse.com>
+
+       * tools/Makefile.am (TOOLS_ZIP): Make writable the copied subtrees
+       asm/ and classes/.
+       * tools/Makefile.in: Re-generate.
+
 2010-06-03  Andrew John Hughes  <ahughes@redhat.com>
 
        * examples/gnu/classpath/examples/CORBA/NamingService/Demo.java,

diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am
index 44489c8..f7ad91c 100755 (executable)
--- 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 adb8c09..d82fac6 100644 (file)
--- 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