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 592724539fc60539d75e168410afa289a72fe3d7 (commit) from 8ec9602b6ddd954250b175840d9ee778e1fbd786 (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/592724539fc60539d75e168410afa289a7... commit 592724539fc60539d75e168410afa289a72fe3d7 Author: Pavan Balaji <[email protected]> Date: Wed Oct 21 14:00:59 2015 -0500 Check if the names are identical before creating symlinks. Thanks to Torquil Macdonald Sorensen for reporting the issue. Signed-off-by: Ken Raffenetti <[email protected]> diff --git a/Makefile.am b/Makefile.am index 811a4df..bde9873 100644 --- a/Makefile.am +++ b/Makefile.am @@ -233,20 +233,44 @@ install-exec-hook: fi ; \ done ; \ if test -e ${DESTDIR}${bindir}/@MPICXX_NAME@ ; then \ - cd ${DESTDIR}${bindir} && ln -f -s @MPICXX_NAME@ @MPICPP_NAME@ ; fi ; \ + if test "@MPICXX_NAME@" != "@MPICPP_NAME@" ; then \ + cd ${DESTDIR}${bindir} && ln -f -s @MPICXX_NAME@ @MPICPP_NAME@ ; \ + fi ; \ + fi ; \ if test -e ${DESTDIR}${bindir}/@MPIFORT_NAME@ ; then \ - cd ${DESTDIR}${bindir} && ln -f -s @MPIFORT_NAME@ @MPIF90_NAME@ ; fi ; \ + if test "@MPIFORT_NAME@" != "@MPIF90_NAME@" ; then \ + cd ${DESTDIR}${bindir} && ln -f -s @MPIFORT_NAME@ @MPIF90_NAME@ ; \ + fi ; \ + fi ; \ if test -e ${DESTDIR}${bindir}/@MPIFORT_NAME@ -a ! -e ${DESTDIR}${bindir}/@MPIF77_NAME@ ; then \ - cd ${DESTDIR}${bindir} && ln -f -s @MPIFORT_NAME@ @MPIF77_NAME@ ; fi ; \ + if test "@MPIFORT_NAME@" != "@MPIF77_NAME@" ; then \ + cd ${DESTDIR}${bindir} && ln -f -s @MPIFORT_NAME@ @MPIF77_NAME@ ; \ + fi ; \ + fi ; \ if test -e ${DESTDIR}${libdir}/lib@MPILIBNAME@@SHLIB_EXT@ ; then \ - cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpl@SHLIB_EXT@ ; \ - cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libopa@SHLIB_EXT@ ; \ - cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpich@SHLIB_EXT@ ; fi ; \ + if test "@MPILIBNAME@" != "mpl" ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpl@SHLIB_EXT@ ; \ + fi ; \ + if test "@MPILIBNAME@" != "opa" ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libopa@SHLIB_EXT@ ; \ + fi ; \ + if test "@MPILIBNAME@" != "mpich" ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPILIBNAME@@SHLIB_EXT@ libmpich@SHLIB_EXT@ ; \ + fi ; \ + fi ; \ if test -e ${DESTDIR}${libdir}/lib@MPIFCLIBNAME@@SHLIB_EXT@ ; then \ - cd ${DESTDIR}${libdir} && ln -f -s lib@MPIFCLIBNAME@@SHLIB_EXT@ libfmpich@SHLIB_EXT@ ; \ - cd ${DESTDIR}${libdir} && ln -f -s lib@MPIFCLIBNAME@@SHLIB_EXT@ libmpichf90@SHLIB_EXT@ ; fi ; \ + if test "@MPIFCLIBNAME@" != "fmpich" ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPIFCLIBNAME@@SHLIB_EXT@ libfmpich@SHLIB_EXT@ ; \ + fi ; \ + if test "@MPIFCLIBNAME@" != "mpichf90" ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPIFCLIBNAME@@SHLIB_EXT@ libmpichf90@SHLIB_EXT@ ; \ + fi ; \ + fi ; \ if test -e ${DESTDIR}${libdir}/lib@MPICXXLIBNAME@@SHLIB_EXT@ ; then \ - cd ${DESTDIR}${libdir} && ln -f -s lib@MPICXXLIBNAME@@SHLIB_EXT@ libmpichcxx@SHLIB_EXT@ ; fi + if test "@MPICXXLIBNAME@" != "mpichcxx" ; then \ + cd ${DESTDIR}${libdir} && ln -f -s lib@MPICXXLIBNAME@@SHLIB_EXT@ libmpichcxx@SHLIB_EXT@ ; \ + fi ; \ + fi # the configure step checks for the 'lib' dir to decide whether a source # directory has been previously used for an in-path build before allowing a ----------------------------------------------------------------------- Summary of changes: Makefile.am | 42 +++++++++++++++++++++++++++++++++--------- 1 files changed, 33 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository