Skip to content

Commit 25bf9e4

Browse files
committed
wrappers: install the pkgconfig scripts better
Whenever we're installing binaries, install the pkgconfig scripts. Remove the AM conditional logic from deep inside other conditionals and just make it standalone at the top of the file (because installing the .pc files really does not depend on whether we're installing the script wrappers or binary wrappers). Signed-off-by: Jeff Squyres <jeff@squyres.com>
1 parent 55c0bda commit 25bf9e4

File tree

1 file changed

+15
-11
lines changed

1 file changed

+15
-11
lines changed

ompi/tools/wrappers/Makefile.am

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,21 @@
2222
# $HEADER$
2323
#
2424

25+
if OPAL_INSTALL_BINARIES
26+
pkgconfigdir = $(libdir)/pkgconfig
27+
pkgconfig_DATA = ompi.pc ompi-c.pc
28+
29+
if OMPI_HAVE_CXX_COMPILER
30+
pkgconfig_DATA += ompi-cxx.pc
31+
endif
32+
33+
if OMPI_HAVE_FORTRAN_COMPILER
34+
pkgconfig_DATA += ompi-fort.pc
35+
endif
36+
endif # OPAL_INSTALL_BINARIES
37+
38+
#-----------------
39+
2540
if OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
2641

2742
bin_SCRIPTS = ompi_wrapper_script
@@ -70,17 +85,6 @@ else # OPAL_WANT_SCRIPT_WRAPPER_COMPILERS
7085

7186
if OPAL_INSTALL_BINARIES
7287

73-
pkgconfigdir = $(libdir)/pkgconfig
74-
pkgconfig_DATA = ompi.pc ompi-c.pc
75-
76-
if OMPI_HAVE_CXX_COMPILER
77-
pkgconfig_DATA += ompi-cxx.pc
78-
endif
79-
80-
if OMPI_HAVE_FORTRAN_COMPILER
81-
pkgconfig_DATA += ompi-fort.pc
82-
endif
83-
8488
if OMPI_WANT_JAVA_BINDINGS
8589
bin_SCRIPTS = mpijavac.pl
8690
endif

0 commit comments

Comments
 (0)