diff options
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2012-03-08 02:59:20 +0000 |
|---|---|---|
| committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2012-03-08 02:59:20 +0000 |
| commit | 148cb5871280e3450c0bdbd2dce0a83156c4b4b8 (patch) | |
| tree | cb11c3e3b422e1a4ceb8ec8de40f8250d579bb14 | |
| parent | 7a8504feebb3032c62c8f64c1e2a5290f2c3347b (diff) | |
| download | classpath-0.99.tar.gz | |
Remove duplicate sources and fail on error when copying tool sources.classpath-0.99
2012-03-07 Andrew John Hughes <ahughes@redhat.com>
* tools/Makefile.am:
(TOOLS_JAVA_FILES): Remove duplication.
(dist-hook): Fail if copying fails.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | tools/Makefile.am | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -1,5 +1,11 @@ 2012-03-07 Andrew John Hughes <ahughes@redhat.com> + * tools/Makefile.am: + (TOOLS_JAVA_FILES): Remove duplication. + (dist-hook): Fail if copying fails. + +2012-03-07 Andrew John Hughes <ahughes@redhat.com> + * doc/cp-tools.texinfo: Move macro definition outside of if block so gcctabopt is always defined. diff --git a/tools/Makefile.am b/tools/Makefile.am index d26ec449d..c5db7cd0a 100755 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -131,7 +131,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 \ @@ -303,7 +303,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 |