Merge pull request #950 from jsquyres/pr/v1.10/pkg-config-for-opal-fix

rhc54 · rhc54 · commit 0f2de88d7131 · 2016-02-09T05:51:03.000-08:00
v1.10: opal.pc.in: fix typo; use the write AC_SUBST'ed variable
diff --git a/opal/tools/wrappers/opal.pc.in b/opal/tools/wrappers/opal.pc.in
@@ -14,7 +14,7 @@ libdir=@libdir@
 # (they're pulled in via libopen-pal.so's implicit dependencies), so
 # list them in Libs.private.
 #
-Libs: -L${libdir} @OPAL_WRAPPER_EXTRA_LDFLAGS@ -lopen-pal 
+Libs: -L${libdir} @OPAL_PKG_CONFIG_LDFLAGS@ -lopen-pal
 Libs.private: @OPAL_WRAPPER_EXTRA_LIBS@
 #
 # It is safe to hard-wire the -I before the EXTRA_INCLUDES because we

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ libdir=@libdir@`
`14`	`14`	`# (they're pulled in via libopen-pal.so's implicit dependencies), so`
`15`	`15`	`# list them in Libs.private.`
`16`	`16`	`#`
`17`		`-Libs: -L${libdir} @OPAL_WRAPPER_EXTRA_LDFLAGS@ -lopen-pal`
	`17`	`+Libs: -L${libdir} @OPAL_PKG_CONFIG_LDFLAGS@ -lopen-pal`
`18`	`18`	`Libs.private: @OPAL_WRAPPER_EXTRA_LIBS@`
`19`	`19`	`#`
`20`	`20`	`# It is safe to hard-wire the -I before the EXTRA_INCLUDES because we`