Skip to content

Commit b4bf0f8

Browse files
jsquyresjsquyres
authored
Merge pull request #12649 from jsquyres/pr/move-fortran-modulefiles-install
Parameterize and move Fortran MPI bindings modulefiles install location
2 parents ff12b69 + 7338594 commit b4bf0f8

File tree

10 files changed

+44
-30
lines changed

10 files changed

+44
-30
lines changed

‎config/ompi_configure_options.m4

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,15 @@ case "x$enable_mpi_fortran" in
166166
;;
167167
esac
168168

169+
AC_MSG_CHECKING([where to install Fortran MPI modules])
170+
AC_ARG_WITH([mpi-moduledir],
171+
[AS_HELP_STRING([--with-mpi-moduledir],
172+
[specify where to install Fortran MPI modules (default: $libdir)])],
173+
[OMPI_FORTRAN_MODULEDIR=$withval],
174+
[OMPI_FORTRAN_MODULEDIR=$libdir])
175+
AC_SUBST(OMPI_FORTRAN_MODULEDIR)
176+
AC_MSG_RESULT([$OMPI_FORTRAN_MODULEDIR])
177+
169178
# Remove these when we finally kill them once and for all
170179
AC_ARG_ENABLE([mpi1-compatibility],
171180
[AS_HELP_STRING([--enable-mpi1-compatibility],

‎config/opal_setup_wrappers.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
541541
OMPI_WRAPPER_FCFLAGS='-I${includedir}'" ${wrapper_extra_fcflags} ${with_wrapper_fcflags}"
542542
AS_IF([test -n "${OMPI_FC_MODULE_FLAG}"],
543543
[dnl deal with some interesting expansion behavior in OPAL_APPEND
544-
wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG}"'${libdir}'
544+
wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG} ${OMPI_FORTRAN_MODULEDIR}"
545545
OPAL_APPEND([OMPI_WRAPPER_FCFLAGS], [${wrapper_tmp_arg}])])
546546
AC_SUBST([OMPI_WRAPPER_FCFLAGS])
547547
AC_MSG_RESULT([$OMPI_WRAPPER_EXTRA_FCFLAGS])
@@ -780,7 +780,7 @@ AC_DEFUN([OPAL_SETUP_WRAPPER_FINAL],[
780780
OSHMEM_WRAPPER_FCFLAGS='-I${includedir}'" ${wrapper_extra_fcflags} ${with_wrapper_fcflags}"
781781
AS_IF([test -n "${OMPI_FC_MODULE_FLAG}"],
782782
[dnl deal with some interesting expansion behavior in OPAL_APPEND
783-
wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG}"'${libdir}'
783+
wrapper_tmp_arg="${OMPI_FC_MODULE_FLAG} ${OMPI_FORTRAN_MODULEDIR}"
784784
OPAL_APPEND([OSHMEM_WRAPPER_FCFLAGS], [${wrapper_tmp_arg}])])
785785
AC_SUBST([OSHMEM_WRAPPER_FCFLAGS])
786786
AC_MSG_RESULT([$OSHMEM_WRAPPER_EXTRA_FCFLAGS])

‎docs/installing-open-mpi/configure-cli-options/mpi.rst

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,11 @@ MPI API behaviors that can be used with ``configure``:
6060
``--disable-mpi-fortran``). This is mutually exclusive
6161
with building the OpenSHMEM Fortran interface.
6262

63+
* ``--with-mpi-moduledir=DIR``:
64+
Specify a specific ``DIR`` directory where to install the MPI
65+
Fortran bindings modulefiles. By default, Open MPI will install
66+
Fortran modulefiles into ``$libdir``.
67+
6368
* ``--enable-mpi-ext[=LIST]``:
6469
Enable Open MPI's non-portable API extensions. ``LIST`` is a
6570
comma-delmited list of extensions. If no ``LIST`` is specified, all

‎ompi/mpi/fortran/mpiext-use-mpi-f08/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ CLEANFILES += *.i90
7373
#
7474
install-exec-hook:
7575
@ for file in `ls *.mod`; do \
76-
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
77-
$(INSTALL) $$file $(DESTDIR)$(libdir); \
76+
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
77+
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
7878
done
7979

8080
uninstall-local:
8181
@ for file in `ls *.mod`; do \
82-
echo rm -f $(DESTDIR)$(libdir)/$$file; \
83-
rm -f $(DESTDIR)$(libdir)/$$file; \
82+
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
83+
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
8484
done
8585

8686
else

‎ompi/mpi/fortran/mpiext-use-mpi/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,14 @@ CLEANFILES += *.i90
7171
#
7272
install-exec-hook:
7373
@ for file in `ls *.mod`; do \
74-
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
75-
$(INSTALL) $$file $(DESTDIR)$(libdir); \
74+
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
75+
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
7676
done
7777

7878
uninstall-local:
7979
@ for file in `ls *.mod`; do \
80-
echo rm -f $(DESTDIR)$(libdir)/$$file; \
81-
rm -f $(DESTDIR)$(libdir)/$$file; \
80+
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
81+
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
8282
done
8383

8484
else

‎ompi/mpi/fortran/use-mpi-f08/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -566,14 +566,14 @@ mpi-f08.lo: $(module_sentinel_files) $(SIZEOF_H)
566566

567567
install-exec-hook:
568568
@ for file in `ls *.mod`; do \
569-
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
570-
$(INSTALL) $$file $(DESTDIR)$(libdir); \
569+
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
570+
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
571571
done
572572

573573
uninstall-local:
574574
@ for file in `ls *.mod`; do \
575-
echo rm -f $(DESTDIR)$(libdir)/$$file; \
576-
rm -f $(DESTDIR)$(libdir)/$$file; \
575+
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
576+
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
577577
done
578578

579579
endif

‎ompi/mpi/fortran/use-mpi-f08/mod/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,14 @@ pmpi-f08-interfaces.lo: mpi-f08-rename.h
102102

103103
install-exec-hook:
104104
@ for file in `ls *.mod`; do \
105-
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
106-
$(INSTALL) $$file $(DESTDIR)$(libdir); \
105+
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
106+
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
107107
done
108108

109109
uninstall-local:
110110
@ for file in `ls *.mod`; do \
111-
echo rm -f $(DESTDIR)$(libdir)/$$file; \
112-
rm -f $(DESTDIR)$(libdir)/$$file; \
111+
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
112+
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
113113
done
114114

115115
endif

‎ompi/mpi/fortran/use-mpi-ignore-tkr/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,14 @@ CLEANFILES += *.i90
136136

137137
install-exec-hook:
138138
@ for file in `ls *.mod`; do \
139-
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
140-
$(INSTALL) $$file $(DESTDIR)$(libdir); \
139+
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
140+
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
141141
done
142142

143143
uninstall-local:
144144
@ for file in `ls *.mod`; do \
145-
echo rm -f $(DESTDIR)$(libdir)/$$file; \
146-
rm -f $(DESTDIR)$(libdir)/$$file; \
145+
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
146+
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
147147
done
148148

149149
endif

‎ompi/mpi/fortran/use-mpi-tkr/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -168,14 +168,14 @@ DISTCLEANFILES = $(nodist_lib@OMPI_LIBMPI_NAME@_usempi_la_SOURCES)
168168

169169
install-exec-hook:
170170
@ for file in `ls *.mod`; do \
171-
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
172-
$(INSTALL) $$file $(DESTDIR)$(libdir); \
171+
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
172+
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
173173
done
174174

175175
uninstall-local:
176176
@ for file in `ls *.mod`; do \
177-
echo rm -f $(DESTDIR)$(libdir)/$$file; \
178-
rm -f $(DESTDIR)$(libdir)/$$file; \
177+
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
178+
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
179179
done
180180

181181
# if OMPI_BUILD_FORTRAN_USEMPI_TKR_BINDINGS

‎ompi/mpi/fortran/use-mpi/Makefile.am

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ mpi-types.lo: mpi-types.F90
5555

5656
install-exec-hook:
5757
@ for file in `ls *.mod`; do \
58-
echo $(INSTALL) $$file $(DESTDIR)$(libdir); \
59-
$(INSTALL) $$file $(DESTDIR)$(libdir); \
58+
echo $(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
59+
$(INSTALL) $$file $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR); \
6060
done
6161

6262
uninstall-local:
6363
@ for file in `ls *.mod`; do \
64-
echo rm -f $(DESTDIR)$(libdir)/$$file; \
65-
rm -f $(DESTDIR)$(libdir)/$$file; \
64+
echo rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
65+
rm -f $(DESTDIR)$(OMPI_FORTRAN_MODULEDIR)/$$file; \
6666
done
6767
endif

0 commit comments

Comments
 (0)