aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild/import/libpq/configure10
-rw-r--r--build/import/libpq/stub.make4
2 files changed, 7 insertions, 7 deletions
diff --git a/build/import/libpq/configure b/build/import/libpq/configure
index 8e2210f..5474972 100755
--- a/build/import/libpq/configure
+++ b/build/import/libpq/configure
@@ -48,11 +48,11 @@ if [ "$installed" = "n" ]; then
else
- pq_libs=-lpq
+ libpq_libs=-lpq
if pg_config --version > /dev/null 2>&1; then
- pq_cppflags=-I`pg_config --includedir`
+ libpq_cppflags=-I`pg_config --includedir`
else
$echo
@@ -60,7 +60,7 @@ else
$echo "Assuming the C++ compiler will find them automatically."
$echo
- pq_cppflags=
+ libpq_cppflags=
fi
@@ -75,7 +75,7 @@ if [ "$installed" = "n" ]; then
else
- echo pq_cppflags := $pq_cppflags >>$1
- echo pq_libs := $pq_libs >>$1
+ echo libpq_cppflags := $libpq_cppflags >>$1
+ echo libpq_libs := $libpq_libs >>$1
fi
diff --git a/build/import/libpq/stub.make b/build/import/libpq/stub.make
index d12abaa..3fe47b9 100644
--- a/build/import/libpq/stub.make
+++ b/build/import/libpq/stub.make
@@ -14,9 +14,9 @@ ifdef libpq_installed
ifeq ($(libpq_installed),y)
$(call export,\
- l: $(pq_libs),\
+ l: $(libpq_libs),\
cpp-options: ,\
- cpp-options-inline: $(pq_cppflags))
+ cpp-options-inline: $(libpq_cppflags))
else