diff options
| author | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
|---|---|---|
| committer | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
| commit | 5c7411981584e487ac41794feb98a66df9fd6fcb (patch) | |
| tree | febe3d4d4c0c994db223fee8e819bde6582494c9 /libjava/classpath/tools/Makefile.am | |
| parent | 112dfe9f689af01c2dd00e0f153fc25d69095b6c (diff) | |
| download | gcc-5c7411981584e487ac41794feb98a66df9fd6fcb.tar.gz | |
Merge GNU Classpath 0.99 into libjava.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/tools/Makefile.am')
| -rwxr-xr-x | libjava/classpath/tools/Makefile.am | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libjava/classpath/tools/Makefile.am b/libjava/classpath/tools/Makefile.am index f7ad91c9069..a4d48aafebc 100755 --- a/libjava/classpath/tools/Makefile.am +++ b/libjava/classpath/tools/Makefile.am @@ -141,7 +141,7 @@ EXTRA_DIST = toolwrapper.c gappletviewer.in gjarsigner.in gkeytool.in \ gtnameserv.in gorbd.in grmid.in grmic.in gjdoc.in # All our example java source files -TOOLS_JAVA_FILES = $(srcdir)/gnu/classpath/tools/*/*.java \ +TOOLS_JAVA_FILES = \ $(srcdir)/gnu/classpath/tools/*.java \ $(srcdir)/gnu/classpath/tools/*/*.java \ $(srcdir)/gnu/classpath/tools/*/*/*.java \ @@ -174,8 +174,8 @@ PROPERTY_FILES = $(srcdir)/external/asm/org/objectweb/asm/optimizer/shrink.prope $(srcdir)/resource/gnu/classpath/tools/keytool/messages.properties \ $(srcdir)/resource/gnu/classpath/tools/native2ascii/messages.properties \ $(srcdir)/resource/gnu/classpath/tools/appletviewer/messages.properties \ - $(srcdir)/resource/gnu/classpath/tools/common/Messages.properties \ - $(srcdir)/resource/gnu/classpath/tools/getopt/Messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/common/messages.properties \ + $(srcdir)/resource/gnu/classpath/tools/getopt/messages.properties \ $(srcdir)/resource/gnu/classpath/tools/tnameserv/messages.properties \ $(srcdir)/resource/gnu/classpath/tools/jarsigner/messages.properties \ $(srcdir)/resource/gnu/classpath/tools/rmiregistry/messages.properties \ @@ -312,7 +312,9 @@ dist-hook: $(mkinstalldirs) $(distdir)/$$fdir; \ fi; \ echo "cp -p $$file $(distdir)/$$f"; \ - cp -p $$file $(distdir)/$$f; \ + if ! cp -p $$file $(distdir)/$$f; then \ + exit -1 ; \ + fi ; \ done # To generate the example zip just depend on the sources and ignore |