diff options
| -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 |