From 148cb5871280e3450c0bdbd2dce0a83156c4b4b8 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Thu, 8 Mar 2012 02:59:20 +0000 Subject: Remove duplicate sources and fail on error when copying tool sources. 2012-03-07 Andrew John Hughes * tools/Makefile.am: (TOOLS_JAVA_FILES): Remove duplication. (dist-hook): Fail if copying fails. --- ChangeLog | 6 ++++++ tools/Makefile.am | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2a7850c6..6674db33a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-03-07 Andrew John Hughes + + * tools/Makefile.am: + (TOOLS_JAVA_FILES): Remove duplication. + (dist-hook): Fail if copying fails. + 2012-03-07 Andrew John Hughes * doc/cp-tools.texinfo: 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 -- cgit v1.2.1