summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2010-01-30 02:33:50 +0000
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2010-01-30 02:33:50 +0000
commit0e24d2cf64e4384186a0b11489c139e645fd6743 (patch)
tree8e3ab0618efcdced12a62052dad391acb262e972
parentde14d819ad8f716ad9d733731f11d60b089237b8 (diff)
downloadclasspath-0e24d2cf64e4384186a0b11489c139e645fd6743.tar.gz
Remove .svn pruning. Now applied to GCJ local copies only.
2010-01-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR libgcj/38251 * tools/Makefile.am (dist-hook): Prune .svn directories in asm and classes copies. Revert: 2008-11-05 Andrew Haley <aph@redhat.com> * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude .svn directories.
-rw-r--r--ChangeLog12
-rwxr-xr-xtools/Makefile.am8
2 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b7d0ee71..3f69c0984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-15 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
+
+ PR libgcj/38251
+ * tools/Makefile.am (dist-hook): Prune .svn directories in asm and
+ classes copies.
+
+ Revert:
+ 2008-11-05 Andrew Haley <aph@redhat.com>
+
+ * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
+ .svn directories.
+
2010-01-30 Andrew John Hughes <ahughes@redhat.com>
* doc/www.gnu.org/home.wml:
diff --git a/tools/Makefile.am b/tools/Makefile.am
index ce5cf34da..53e918aad 100755
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -356,11 +356,11 @@ if CREATE_GJDOC
endif
if WITH_JAR
-CREATE_TOOLS_ZIP=$(JAR) cf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print`
-UPDATE_TOOLS_ZIP=$(JAR) uf ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print`
+CREATE_TOOLS_ZIP=$(JAR) cf ../$(TOOLS_ZIP) .
+UPDATE_TOOLS_ZIP=$(JAR) uf ../$(TOOLS_ZIP) .
else
-CREATE_TOOLS_ZIP=$(ZIP) -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print`
-UPDATE_TOOLS_ZIP=$(ZIP) -u -r ../$(TOOLS_ZIP) `find . -name .svn -prune -o -type f -print`
+CREATE_TOOLS_ZIP=$(ZIP) -r ../$(TOOLS_ZIP) .
+UPDATE_TOOLS_ZIP=$(ZIP) -u -r ../$(TOOLS_ZIP) .
endif
## First add classpath tools stuff.