[adios] 169/207: Fix pkgconfig

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch master
in repository adios.

commit 7d9b8774982fc3536b1c26cb84a4f598cd100c49
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 16 17:05:32 2014 +0100

    Fix pkgconfig
---
 debian/patches/pkgconfig.patch | 47 +++++++++++++++++++++++-------------------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/debian/patches/pkgconfig.patch b/debian/patches/pkgconfig.patch
index 97a8c3e..5c2a299 100644
--- a/debian/patches/pkgconfig.patch
+++ b/debian/patches/pkgconfig.patch
@@ -1,3 +1,8 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: pkgconfig support for  ADIOS in Debian
+Last-Updated: 2014-06-15
+Forwarded: no
+
 Index: adios-1.7.0/adios.pc.in
 ===================================================================
 --- /dev/null
@@ -14,37 +19,37 @@ Index: adios-1.7.0/adios.pc.in
 +#
 +
 +# Install directory
-+ADIOS_DIR="@prefix@"
++ADIOS_DIR=${prefix}
 +
 +# Flags to build code using ADIOS write API (and read API)
 +ADIOS_INC="-I${ADIOS_DIR}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@"
-+ADIOS_CLIB="-L${ADIOS_DIR}/lib -ladios @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
-+ADIOS_FLIB="-L${ADIOS_DIR}/lib -ladiosf @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
-+ADIOS_V1_FLIB="-L${ADIOS_DIR}/lib -ladiosf_v1 @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_CLIB="-L${libdir} -ladios @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_FLIB="-L${libdir} -ladiosf @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_V1_FLIB="-L${libdir} -ladiosf_v1 @ADIOSLIB_LDFLAGS@ @ADIOSLIB_LDADD@ @LDFLAGS@ @LIBS@"
 +
 +# Flags to build code using ADIOS read API only
-+ADIOSREAD_INC="-I${ADIOS_DIR}/include @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@"
-+ADIOSREAD_V1_INC="-I${ADIOS_DIR}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@"
-+ADIOSREAD_CLIB="-L${ADIOS_DIR}/lib -ladiosread @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
-+ADIOSREAD_FLIB="-L${ADIOS_DIR}/lib -ladiosreadf @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
-+ADIOSREAD_V1_FLIB="-L${ADIOS_DIR}/lib -ladiosreadf_v1 @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
++ADIOSREAD_INC="-I${prefix}/include @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@"
++ADIOSREAD_V1_INC="-I${prefix}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_CPPFLAGS@ @ADIOSREADLIB_CFLAGS@"
++ADIOSREAD_CLIB="-L${libdir} -ladiosread @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
++ADIOSREAD_FLIB="-L${libdir} -ladiosreadf @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
++ADIOSREAD_V1_FLIB="-L${libdir} -ladiosreadf_v1 @ADIOSREADLIB_LDFLAGS@ @ADIOSREADLIB_LDADD@"
 +
 +# Flags to build code using ADIOS read API only in a sequential code (no MPI)
-+ADIOSREAD_SEQ_INC="-I${ADIOS_DIR}/include @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@"
-+ADIOSREAD_SEQ_V1_INC="-I${ADIOS_DIR}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@"
-+ADIOSREAD_SEQ_CLIB="-L${ADIOS_DIR}/lib -ladiosread_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
-+ADIOSREAD_SEQ_FLIB="-L${ADIOS_DIR}/lib -ladiosreadf_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
-+ADIOSREAD_SEQ_V1_FLIB="-L${ADIOS_DIR}/lib -ladiosreadf_nompi_v1 @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
++ADIOSREAD_SEQ_INC="-I${prefix}/include @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@"
++ADIOSREAD_SEQ_V1_INC="-I${prefix}/include @MACRODEFFLAG at ADIOS_USE_READ_API_1 @ADIOSREADLIB_SEQ_CPPFLAGS@ @ADIOSREADLIB_SEQ_CFLAGS@"
++ADIOSREAD_SEQ_CLIB="-L${libdir} -ladiosread_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
++ADIOSREAD_SEQ_FLIB="-L${libdir} -ladiosreadf_nompi @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
++ADIOSREAD_SEQ_V1_FLIB="-L${libdir} -ladiosreadf_nompi_v1 @ADIOSREADLIB_SEQ_LDFLAGS@ @ADIOSREADLIB_SEQ_LDADD@"
 +
 +#Flags to build code using ADIOS write API in a sequential code (no MPI)
-+ADIOS_SEQ_INC="-I${ADIOS_DIR}/include @ADIOSLIB_SEQ_CPPFLAGS@ @ADIOSLIB_SEQ_CFLAGS@"
-+ADIOS_SEQ_CLIB="-L${ADIOS_DIR}/lib -ladios_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
-+ADIOS_SEQ_FLIB="-L${ADIOS_DIR}/lib -ladiosf_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
-+ADIOS_SEQ_V1_FLIB="-L${ADIOS_DIR}/lib -ladiosf_nompi_v1 @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_SEQ_INC="-I${prefix}/include @ADIOSLIB_SEQ_CPPFLAGS@ @ADIOSLIB_SEQ_CFLAGS@"
++ADIOS_SEQ_CLIB="-L${libdir} -ladios_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_SEQ_FLIB="-L${libdir} -ladiosf_nompi @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_SEQ_V1_FLIB="-L${libdir} -ladiosf_nompi_v1 @ADIOSLIB_SEQ_LDFLAGS@ @ADIOSLIB_SEQ_LDADD@ @LDFLAGS@ @LIBS@"
 +
 +#The following flags are not used. It is only for internal utilities of ADIOS, using libadios_internal_nompi.a
-+ADIOS_INT_INC="-I${ADIOS_DIR}/include @ADIOSLIB_INT_CPPFLAGS@ @ADIOSLIB_INT_CFLAGS@"
-+ADIOS_INT_CLIB="-L${ADIOS_DIR}/lib -ladios_internal_nompi @ADIOSLIB_INT_LDFLAGS@ @ADIOSLIB_INT_LDADD@ @LDFLAGS@ @LIBS@"
++ADIOS_INT_INC="-I${prefix}/include @ADIOSLIB_INT_CPPFLAGS@ @ADIOSLIB_INT_CFLAGS@"
++ADIOS_INT_CLIB="-L${libdir} -ladios_internal_nompi @ADIOSLIB_INT_LDFLAGS@ @ADIOSLIB_INT_LDADD@ @LDFLAGS@ @LIBS@"
 +
 +VERSIONSTRING="@VERSION@"
 +
@@ -53,7 +58,7 @@ Index: adios-1.7.0/adios.pc.in
 +Description: Adaptable IO system
 +Requires: 
 +Version: @VERSION@
-+Cflags: -I${ADIOS_DIR}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
++Cflags: -I${prefix}/include @ADIOSLIB_CPPFLAGS@ @ADIOSLIB_CFLAGS@
 +Libs: ${ADIOS_CLIB}
 +Libs.private: -ldl
 +Cflags: -pthread

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git