diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-02-09 11:33:36 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-02-09 11:33:36 +0200 |
| commit | a7512f3eb03ae2b6361e56518a2f405e386315a0 (patch) | |
| tree | 141e85f9b2fee728883e3851628da02f72ef639c /extension | |
| parent | 4f92f35791d975671881e21f6b79b71050fd2787 (diff) | |
| parent | c1e55fde1a4bb72a0627ab37fe5ba1493cbf91eb (diff) | |
| download | egawk-a7512f3eb03ae2b6361e56518a2f405e386315a0.tar.gz egawk-a7512f3eb03ae2b6361e56518a2f405e386315a0.tar.bz2 egawk-a7512f3eb03ae2b6361e56518a2f405e386315a0.zip | |
Merge branch 'gawk-4.2-stable'
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 8 | ||||
| -rwxr-xr-x | extension/configure | 2 | ||||
| -rw-r--r-- | extension/configure.ac | 4 |
3 files changed, 12 insertions, 2 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index b811e6ca..83d43729 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,11 @@ +2018-02-08 Andrew J. Schorr <aschorr@telemetry-investments.com> + + * configure.ac (pkgextensiondir): This must be set to + '${libdir}/gawk'${EXTENSIONDIR} to match gawk's value. + The previous value of '${pkglibdir}'${EXTENSIONDIR} was incorrect, + because it was putting the extensions in the gawk-extensions + libdir subdirectory, instead of the gawk subdirectory. + 2018-02-02 Arnold D. Robbins <arnold@skeeve.com> * filefuncs.3am, fnmatch.3am, fork.3am, inplace.3am, diff --git a/extension/configure b/extension/configure index 084334e1..2ace2d86 100755 --- a/extension/configure +++ b/extension/configure @@ -12595,7 +12595,7 @@ CC=$lt_save_CC -pkgextensiondir='${pkglibdir}'${EXTENSIONDIR} +pkgextensiondir='${libdir}/gawk'${EXTENSIONDIR} if test "$GCC" = yes diff --git a/extension/configure.ac b/extension/configure.ac index e8b242a0..2b913364 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -56,7 +56,9 @@ dnl AC_PROG_INSTALL dnl use the same definition as the main configure script. dnl EXTENSIONDIR is exported if it was set there. -AC_SUBST([pkgextensiondir], ['${pkglibdir}'${EXTENSIONDIR}]) +dnl N.B. We must use ${libdir}/gawk instead of $pkglibdir because $pkglibdir +dnl is set to ${libdir}/gawk-extensions, which is not what we want. +AC_SUBST([pkgextensiondir], ['${libdir}/gawk'${EXTENSIONDIR}]) if test "$GCC" = yes then |