This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "MPICH primary repository". The branch, master has been updated via 866598b9d77a5c953ff5cc12cda2b78ae713bf33 (commit) from 3aa3c3369139a862620d4f40c03027fea759ff80 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://git.mpich.org/mpich.git/commitdiff/866598b9d77a5c953ff5cc12cda2b78ae7... commit 866598b9d77a5c953ff5cc12cda2b78ae713bf33 Author: Pavan Balaji <[email protected]> Date: Tue Oct 14 12:54:47 2014 -0500 Fixes to the man and www page builds. We need to check both the build and src directories before installing the man and www pages. We were only checking the build directory for man and the src directory for www. Also, make sure to install both the man pages and the www pages on install. Signed-off-by: Sangmin Seo <[email protected]> diff --git a/Makefile.am b/Makefile.am index fe42721..d08430e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -453,7 +453,14 @@ htmldoc-local: $(mpi_sources:.c=.html-phony) $(doc1_src_txt:.txt=.html1-phony) INSTALL_DATA_LOCAL_TARGETS += install-man-local # this is a variation on the recipe that was previously generated by simplemake install-man-local: - @if test -d $(top_builddir)/man && cd $(top_builddir)/man ; then \ + @dir= ; \ + if test -d $(builddir)/man ; then \ + dir=$(builddir)/man ; \ + elif test -d $(srcdir)/man ; then \ + dir=$(srcdir)/man ; \ + fi ; \ + export dir ; \ + if test ! -z $$dir && test -d $$dir && cd $$dir ; then \ for name in * ; do \ if [ "$$name" = "*" ] ; then continue ; fi ; \ if [ -f $$name ] ; then \ @@ -477,8 +484,16 @@ install-man-local: done ; \ fi +INSTALL_DATA_LOCAL_TARGETS += install-html-local install-html-local: - @if test -d $(builddir)/www && cd $(builddir)/www ; then \ + @dir= ; \ + if test -d $(builddir)/www ; then \ + dir=$(builddir)/www ; \ + elif test -d $(srcdir)/www ; then \ + dir=$(srcdir)/www ; \ + fi ; \ + export dir ; \ + if test ! -z $$dir && test -d $$dir && cd $$dir ; then \ for name in * ; do \ if [ "$$name" = "*" ] ; then continue ; fi ; \ if [ -f $$name ] ; then \ ----------------------------------------------------------------------- Summary of changes: Makefile.am | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository