aboutsummaryrefslogtreecommitdiffstats
path: root/extension
diff options
context:
space:
mode:
Diffstat (limited to 'extension')
-rw-r--r--extension/ChangeLog5
-rwxr-xr-xextension/configure2
-rw-r--r--extension/configure.ac4
3 files changed, 9 insertions, 2 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog
index 830c6568..f7884019 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2017-12-20 Arnold D. Robbins <arnold@skeeve.com>
+
+ * configure.ac: Add support for the --enable-versioned-dir option
+ in the main configure program.
+
2017-12-19 Arnold D. Robbins <arnold@skeeve.com>
* configure.ac: Add --disable-mpfr to be in sync with main
diff --git a/extension/configure b/extension/configure
index e5fd4752..3666df28 100755
--- a/extension/configure
+++ b/extension/configure
@@ -12595,7 +12595,7 @@ CC=$lt_save_CC
-pkgextensiondir='${libdir}/gawk'
+pkgextensiondir='${pkglibdir}'${EXTENSIONDIR}
if test "$GCC" = yes
diff --git a/extension/configure.ac b/extension/configure.ac
index 69461d24..e1438259 100644
--- a/extension/configure.ac
+++ b/extension/configure.ac
@@ -54,7 +54,9 @@ AC_DISABLE_STATIC
LT_INIT
dnl AC_PROG_INSTALL
-AC_SUBST([pkgextensiondir], ['${libdir}/gawk'])
+dnl use the same definition as the main configure script.
+dnl EXTENSIONDIR is exported if it was set there.
+AC_SUBST([pkgextensiondir], ['${pkglibdir}'${EXTENSIONDIR}])
if test "$GCC" = yes
then