[gawk-diffs] [SCM] gawk branch, gawk-4.2-stable, updated. gawk-4.1.0-2920-gc326b7d

[Andrew J. Schorr]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, gawk-4.2-stable has been updated
       via  c326b7dfa00760f7127912053fad544b0b79da23 (commit)
      from  4197063335d758d0eacb8b4cb74b232ad596c784 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=c326b7dfa00760f7127912053fad544b0b79da23

commit c326b7dfa00760f7127912053fad544b0b79da23
Author: Andrew J. Schorr <address@hidden>
Date:   Thu Feb 8 08:36:02 2018 -0500

    Fix extension pkgextensiondir installation location.

diff --git a/extension/ChangeLog b/extension/ChangeLog
index b811e6c..83d4372 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,11 @@
+2018-02-08         Andrew J. Schorr     <address@hidden>
+
+       * 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     <address@hidden>
 
        * filefuncs.3am, fnmatch.3am, fork.3am, inplace.3am,
diff --git a/extension/configure b/extension/configure
index 084334e..2ace2d8 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 e8b242a..2b91336 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

-----------------------------------------------------------------------

Summary of changes:
 extension/ChangeLog    | 8 ++++++++
 extension/configure    | 2 +-
 extension/configure.ac | 4 +++-
 3 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
gawk