From 38cda5e584d869abd82f89199f5e3fb29122ab55 Mon Sep 17 00:00:00 2001
From: William Pitcock <nenolod@dereferenced.org>
Date: Sat, 24 Jun 2017 12:45:44 -0500
Subject: [PATCH] autotools: replace PKGCONFIGDIR with PKG_DEFAULT_PATH

---
 Makefile.am          | 2 +-
 configure.ac         | 6 +++---
 tests/test_env.sh.in | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 84689e9..e1a13bc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ datadir                = @datadir@
 includedir             = @includedir@
 system_includedir      = @SYSTEM_INCLUDEDIR@
 system_libdir          = @SYSTEM_LIBDIR@
-pkg_default_dir        = @PKGCONFIGDIR@
+pkg_default_dir        = @PKG_DEFAULT_PATH@
 pkgconfigdir           = $(libdir)/pkgconfig
 nodist_pkgconfig_DATA  = libpkgconf.pc
 
diff --git a/configure.ac b/configure.ac
index 296f720..2f284eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,10 +24,10 @@ LT_INIT
 AC_SYS_LARGEFILE
 
 AC_ARG_WITH([pkg-config-dir],[AC_HELP_STRING([--with-pkg-config-dir],[specify
-	     the place where pc files will be found])],PKGCONFIGDIR="$withval",
-	     PKGCONFIGDIR="${libdir}/pkgconfig:${datadir}/pkgconfig")
+	     the place where pc files will be found])],PKG_DEFAULT_PATH="$withval",
+	     PKG_DEFAULT_PATH="${libdir}/pkgconfig:${datadir}/pkgconfig")
 
-AC_SUBST([PKGCONFIGDIR])
+AC_SUBST([PKG_DEFAULT_PATH])
 
 AC_ARG_WITH([system-libdir],[AC_HELP_STRING([--with-system-libdir],[specify the
 	     system library directory (default LIBDIR)])],
diff --git a/tests/test_env.sh.in b/tests/test_env.sh.in
index 3120811..229dd00 100644
--- a/tests/test_env.sh.in
+++ b/tests/test_env.sh.in
@@ -31,7 +31,7 @@ esac
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 datarootdir="@datarootdir@"
-pcpath="@PKGCONFIGDIR@"
+pcpath="@PKG_DEFAULT_PATH@"
 
 tests_init()
 {