From b7f8a670ec5e1723e5f8bd4a1ec1f8963a14b294 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Fri, 15 Jan 2010 14:12:08 +0000 Subject: [PATCH] - Fix pkgconfig file substitution - Bump version so we are later than the equivalent version from Red Hat Enterprise Linux --- openmpi.pc.in | 2 +- openmpi.spec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/openmpi.pc.in b/openmpi.pc.in index 342ca47..43b05d3 100644 --- a/openmpi.pc.in +++ b/openmpi.pc.in @@ -3,5 +3,5 @@ Name: @NAME@ Description: Open Message Passing Interface headers and libraries URL: http://www.open-mpi.org/ Version: @VERSION@-@CC@ -Libs: -L@LIBDIR@/@MPIDIR@/lib -lmpi +Libs: -L@LIBDIR@ -lmpi Cflags: -I@INCDIR@ @MODEFLAG@ diff --git a/openmpi.spec b/openmpi.spec index cefcf45..8e1d690 100644 --- a/openmpi.spec +++ b/openmpi.spec @@ -146,7 +146,7 @@ mkdir %{buildroot}%{_mandir}/%{namearch}/man{2,4,5,6,8,9,n} # Make the pkgconfig file mkdir -p %{buildroot}%{_libdir}/pkgconfig -sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}'#g;s#@CC@#'%{opt_cc}'#g;s#@MPIDIR@#'%{name}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc +sed 's#@NAME@#'%{name}'#g;s#@VERSION@#'%{version}'#g;s#@LIBDIR@#'%{_libdir}/%{name}/lib'#g;s#@CC@#'%{opt_cc}'#g;s#@INCDIR@#'%{_includedir}/%{namearch}'#g;s#@MODEFLAG@#'%{?modeflag}'#g' < %SOURCE1 > %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc # Make the environment-modules file mkdir -p %{buildroot}%{_sysconfdir}/modulefiles # Since we're doing our own substitution here, use our own definitions.