summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Haley <aph@redhat.com>2008-11-05 13:51:55 +0000
committerAndrew Haley <aph@redhat.com>2008-11-05 13:51:55 +0000
commit301921ee1c8b9a6a1bea5ab725432d19f17c68bf (patch)
tree8cf2b6302b10f091102415e476bcc40009a7f7ba
parent97c632e531b8352cf210a603eae846955b2181a9 (diff)
downloadclasspath-301921ee1c8b9a6a1bea5ab725432d19f17c68bf.tar.gz
2008-11-05 Andrew Haley <aph@redhat.com>
* tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude .svn direcories.
-rw-r--r--ChangeLog5
-rwxr-xr-xtools/Makefile.am8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1bed65a36..7cb6ba9fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-05 Andrew Haley <aph@redhat.com>
+
+ * tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
+ .svn direcories.
+
2008-10-23 David Edelsohn <edelsohn@gnu.org>
* native/fdlibm/fdlibm.h: Undef hz.
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 53e918aad..ce5cf34da 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) .
-UPDATE_TOOLS_ZIP=$(JAR) uf ../$(TOOLS_ZIP) .
+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`
else
-CREATE_TOOLS_ZIP=$(ZIP) -r ../$(TOOLS_ZIP) .
-UPDATE_TOOLS_ZIP=$(ZIP) -u -r ../$(TOOLS_ZIP) .
+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`
endif
## First add classpath tools stuff.