diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-01 12:32:02 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-03-01 12:32:02 +0000 |
| commit | c8d454446f3b060c7e5296cd6e030d2150a6b929 (patch) | |
| tree | 928846b1de85d6704f8295582d018d869bdf20d5 /libjava/classpath/tools/Makefile.am | |
| parent | 355f25daa504140276ca729fafd54f3dd7f5fe4b (diff) | |
| download | ppe42-gcc-c8d454446f3b060c7e5296cd6e030d2150a6b929.tar.gz ppe42-gcc-c8d454446f3b060c7e5296cd6e030d2150a6b929.zip | |
PR libgcj/38251
* tools/Makefile.am (dist-hook): Prune .svn directories in asm and
classes copies.
* tools/Makefile.in: Regenerate.
Revert:
2008-11-05 Andrew Haley <aph@redhat.com>
* tools/Makefile.am (UPDATE_TOOLS_ZIP, CREATE_TOOLS_ZIP): Exclude
.svn direcories.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157137 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/tools/Makefile.am')
| -rwxr-xr-x | libjava/classpath/tools/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index 44bc49fdf29..44489c89afd 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -371,6 +371,9 @@ endif ## BEGIN GCJ LOCAL cp -pR $(srcdir)/asm . cp -pR $(srcdir)/classes . + if [ -d asm/.svn ]; then \ + find asm classes -depth -type d -name .svn -exec rm -rf \{\} \;; \ + fi ## END GCJ LOCAL if CREATE_GJDOC ## Copy over gjdoc resource files. @@ -383,11 +386,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. |
