From 628c730196d8fb566c142bf4e09f8f38c2406fb7 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Tue, 13 Sep 2016 09:49:01 +0900 Subject: [PATCH] pkgconfig: define the pkgincludedir variable in *.pc files this has been made necesarry with open-mpi/ompi@12e796dcaf4d6ea0cab9fb87187df58687f4b9e0 Refs open-mpi/ompi#2069 --- ompi/tools/wrappers/ompi-c.pc.in | 1 + ompi/tools/wrappers/ompi-cxx.pc.in | 1 + ompi/tools/wrappers/ompi-fort.pc.in | 1 + ompi/tools/wrappers/ompi.pc.in | 1 + opal/tools/wrappers/opal.pc.in | 1 + orte/tools/wrappers/orte.pc.in | 1 + 6 files changed, 6 insertions(+) diff --git a/ompi/tools/wrappers/ompi-c.pc.in b/ompi/tools/wrappers/ompi-c.pc.in index 7c658e950c..df5f293c42 100644 --- a/ompi/tools/wrappers/ompi-c.pc.in +++ b/ompi/tools/wrappers/ompi-c.pc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ +pkgincludedir=@opalincludedir@ # # Note that -lopen-pal and all the EXTRA_LIBS are only necessary when # static linking (they're pulled in by libopen-rte.so's implicit diff --git a/ompi/tools/wrappers/ompi-cxx.pc.in b/ompi/tools/wrappers/ompi-cxx.pc.in index b277c79622..852b2debae 100644 --- a/ompi/tools/wrappers/ompi-cxx.pc.in +++ b/ompi/tools/wrappers/ompi-cxx.pc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ +pkgincludedir=@opalincludedir@ # # Note that -lopen-pal and all the EXTRA_LIBS are only necessary when # static linking (they're pulled in by libopen-rte.so's implicit diff --git a/ompi/tools/wrappers/ompi-fort.pc.in b/ompi/tools/wrappers/ompi-fort.pc.in index e4f533b99b..b320bd40c5 100644 --- a/ompi/tools/wrappers/ompi-fort.pc.in +++ b/ompi/tools/wrappers/ompi-fort.pc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ +pkgincludedir=@opalincludedir@ # # Note that -lopen-pal and all the EXTRA_LIBS are only necessary when # static linking (they're pulled in by libopen-rte.so's implicit diff --git a/ompi/tools/wrappers/ompi.pc.in b/ompi/tools/wrappers/ompi.pc.in index 083fbd3c0f..808c012022 100644 --- a/ompi/tools/wrappers/ompi.pc.in +++ b/ompi/tools/wrappers/ompi.pc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ +pkgincludedir=@opalincludedir@ # # Note that -lopen-pal and all the EXTRA_LIBS are only necessary when # static linking (they're pulled in by libopen-rte.so's implicit diff --git a/opal/tools/wrappers/opal.pc.in b/opal/tools/wrappers/opal.pc.in index 2fd3122184..ed1b3adb5c 100644 --- a/opal/tools/wrappers/opal.pc.in +++ b/opal/tools/wrappers/opal.pc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ +pkgincludedir=@opalincludedir@ # # Note that the EXTRA_LIBS are only necessary when static linking # (they're pulled in via libopen-pal.so's implicit dependencies), so diff --git a/orte/tools/wrappers/orte.pc.in b/orte/tools/wrappers/orte.pc.in index f1d90ecf66..b24814d86e 100644 --- a/orte/tools/wrappers/orte.pc.in +++ b/orte/tools/wrappers/orte.pc.in @@ -9,6 +9,7 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ +pkgincludedir=@opalincludedir@ # # Note that -lopen-pal and all the EXTRA_LIBS are only necessary when # static linking (they're pulled in by libopen-rte.so's implicit