aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libbuild2/c/init.cxx4
-rw-r--r--libbuild2/cc/common.cxx2
-rw-r--r--libbuild2/cc/init.cxx4
-rw-r--r--libbuild2/cc/link-rule.cxx4
-rw-r--r--libbuild2/cc/pkgconfig.cxx2
-rw-r--r--libbuild2/cxx/init.cxx4
6 files changed, 10 insertions, 10 deletions
diff --git a/libbuild2/c/init.cxx b/libbuild2/c/init.cxx
index 3c03c9c..10b3d6a 100644
--- a/libbuild2/c/init.cxx
+++ b/libbuild2/c/init.cxx
@@ -332,8 +332,8 @@ namespace build2
vp["cc.export.libs"],
vp["cc.export.impl_libs"],
- vp["cc.pkconfig.include"],
- vp["cc.pkconfig.lib"],
+ vp["cc.pkgconfig.include"],
+ vp["cc.pkgconfig.lib"],
vp.insert_alias (vp["cc.stdlib"], "c.stdlib"), // Same as cc.stdlib.
diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx
index 99c8f5d..7306274 100644
--- a/libbuild2/cc/common.cxx
+++ b/libbuild2/cc/common.cxx
@@ -1351,7 +1351,7 @@ namespace build2
// idea is that in .pc files that we generate, we copy those macros (or
// custom ones) from *.export.poptions.
//
- // @@ Should we add .pc files as ad hoc members so pkconfig_save() can
+ // @@ Should we add .pc files as ad hoc members so pkgconfig_save() can
// use their names when deriving -l-names (this would be especially
// helpful for binless libraries to get hold of prefix/suffix, etc).
//
diff --git a/libbuild2/cc/init.cxx b/libbuild2/cc/init.cxx
index 33a1133..d766b30 100644
--- a/libbuild2/cc/init.cxx
+++ b/libbuild2/cc/init.cxx
@@ -120,8 +120,8 @@ namespace build2
// files instead of the default install.{include,lib}. Relative paths
// are resolved as install paths.
//
- vp.insert<dir_paths> ("cc.pkconfig.include");
- vp.insert<dir_paths> ("cc.pkconfig.lib");
+ vp.insert<dir_paths> ("cc.pkgconfig.include");
+ vp.insert<dir_paths> ("cc.pkgconfig.lib");
// Hint variables (not overridable).
//
diff --git a/libbuild2/cc/link-rule.cxx b/libbuild2/cc/link-rule.cxx
index 1991eda..0cd87b3 100644
--- a/libbuild2/cc/link-rule.cxx
+++ b/libbuild2/cc/link-rule.cxx
@@ -2850,7 +2850,7 @@ namespace build2
// (Re)generate pkg-config's .pc file. While the target itself might be
// up-to-date from a previous run, there is no guarantee that .pc exists
// or also up-to-date. So to keep things simple we just regenerate it
- // unconditionally (and avoid doing so on uninstall; see pkconfig_save()
+ // unconditionally (and avoid doing so on uninstall; see pkgconfig_save()
// for details).
//
// Also, if you are wondering why don't we just always produce this .pc,
@@ -2860,7 +2860,7 @@ namespace build2
// There is a further complication: we may have no intention of
// installing the library but still need to update it for install (see
// install_scope() for background). In which case we may still not have
- // the installation directories. We handle this in pkconfig_save() by
+ // the installation directories. We handle this in pkgconfig_save() by
// skipping the generation of .pc files (and letting the install rule
// complain if we do end up trying to install them).
//
diff --git a/libbuild2/cc/pkgconfig.cxx b/libbuild2/cc/pkgconfig.cxx
index 7c9f9b1..b0b9675 100644
--- a/libbuild2/cc/pkgconfig.cxx
+++ b/libbuild2/cc/pkgconfig.cxx
@@ -335,7 +335,7 @@ namespace build2
// normalize() may not be correct.
//
// Note that we do normalize -L paths in the usrd logic later
- // (but not when seeting as *.export.loptions).
+ // (but not when setting as *.export.loptions).
for (const string& x: ops)
{
diff --git a/libbuild2/cxx/init.cxx b/libbuild2/cxx/init.cxx
index 941593e..7eedb4a 100644
--- a/libbuild2/cxx/init.cxx
+++ b/libbuild2/cxx/init.cxx
@@ -938,8 +938,8 @@ namespace build2
vp["cc.export.libs"],
vp["cc.export.impl_libs"],
- vp["cc.pkconfig.include"],
- vp["cc.pkconfig.lib"],
+ vp["cc.pkgconfig.include"],
+ vp["cc.pkgconfig.lib"],
vp.insert<string> ("cxx.stdlib"),