diff --git a/code/libswoc.pc.in b/code/libswoc.pc.in index d613bd2..9acdb60 100644 --- a/code/libswoc.pc.in +++ b/code/libswoc.pc.in @@ -7,5 +7,5 @@ Name: LibSWOC++ Description: A collection of solid C++ utilities and classes. Version: pkg_version Requires: -Libs: -L${libdir} -lswoc.pkg_version +Libs: -L${libdir} -lswoc-pkg_version Cflags: -I${includedir} diff --git a/code/libswoc.shared.part b/code/libswoc.shared.part index 7ab58c4..67b98c6 100644 --- a/code/libswoc.shared.part +++ b/code/libswoc.shared.part @@ -30,8 +30,13 @@ def source(env): env.InstallLib(out) # Export the package config. - pc_file = env.Substfile("libswoc.pc", "libswoc.pc.in", SUBST_DICT={ + sdk_pc_file = env.Substfile("libswoc.pc", "libswoc.pc.in", SUBST_DICT={ + "pkg_prefix": env.Dir("$SDK_ROOT").abspath, "pkg_version": "$PART_VERSION" + }) + + pc_file = env.Substfile("_install_/libswoc.pc", "libswoc.pc.in", SUBST_DICT={ "pkg_prefix": env.Dir("$INSTALL_ROOT").abspath, "pkg_version": "$PART_VERSION" }) - env.InstallPkgConfig(pc_file) + env.SdkPkgConfig(sdk_pc_file) + env.InstallPkgConfig(pc_file,create_sdk=False) diff --git a/code/libswoc.static.part b/code/libswoc.static.part index a6a4d05..e9c4b9a 100644 --- a/code/libswoc.static.part +++ b/code/libswoc.static.part @@ -29,11 +29,18 @@ def source(env): env.InstallLib(out) # Export the package config. - pc_file = env.Substfile("libswoc.static.pc", "libswoc.static.pc.in" + sdk_pc_file = env.Substfile("libswoc.static.pc", "libswoc.static.pc.in" + , SUBST_DICT = { + "pkg_prefix": env.Dir("$SDK_ROOT").abspath + , "pkg_version": "$PART_VERSION" + }) + + pc_file = env.Substfile("_install_/libswoc.static.pc", "libswoc.static.pc.in" , SUBST_DICT = { "pkg_prefix": env.Dir("$INSTALL_ROOT").abspath , "pkg_version": "$PART_VERSION" }) - env.InstallPkgConfig(pc_file) + env.SdkPkgConfig(sdk_pc_file) + env.InstallPkgConfig(pc_file,create_sdk=False)