[6916] pkglibexecdir -> pkglibdir

[Gavin D. Smith]

Revision: 6916
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6916
Author:   gavin
Date:     2016-01-03 20:46:04 +0000 (Sun, 03 Jan 2016)
Log Message:
-----------
pkglibexecdir -> pkglibdir

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Makefile.am
    trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-01-02 17:45:27 UTC (rev 6915)
+++ trunk/ChangeLog     2016-01-03 20:46:04 UTC (rev 6916)
@@ -1,3 +1,13 @@
+2016-01-03  Gavin Smith  <address@hidden>
+
+       * tp/Makefile.am,
+       * tp/Texinfo/Convert/XSParagraph/Makefile.am,
+       * tp/texi2any.pl: Replace uses of pkglibexecdir with pkglibdir.
+       Modules installed under pkglibexecdir weren't being found due 
+       not being substituted by configure script.  Reported by
+       Andreas Schwab.  Probably related to AC_SUBST in 'gl_CONFIGMAKE'
+       in 'configmake' gnulib module overriding the default definition.
+
 2016-01-02  Gavin Smith  <address@hidden>
 
        * info/info-utils.c (copy_converting): Don't check whether a 

Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am        2016-01-02 17:45:27 UTC (rev 6915)
+++ trunk/tp/Makefile.am        2016-01-03 20:46:04 UTC (rev 6916)
@@ -1,7 +1,8 @@
 # $Id$
 # Makefile.am for texinfo/tp.
 #
-# Copyright 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+# Copyright 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, 
+# Inc.
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -46,7 +47,7 @@
   -e 's,address@hidden@],$(prefix),g' \
   -e 's,address@hidden@],$(datarootdir),g' \
   -e 's,address@hidden@],$(datadir),g' \
-  -e 's,address@hidden@],$(pkglibexecdir),g' \
+  -e 's,address@hidden@],$(pkglibdir),g' \
   -e 's,address@hidden@],$(PACKAGE),g' \
   -e 's,address@hidden@],$(USE_EXTERNAL_LIBINTL),g' \
   -e 's,address@hidden@],$(USE_EXTERNAL_EASTASIANWIDTH),g' \

Modified: trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am
===================================================================
--- trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2016-01-02 17:45:27 UTC 
(rev 6915)
+++ trunk/tp/Texinfo/Convert/XSParagraph/Makefile.am    2016-01-03 20:46:04 UTC 
(rev 6916)
@@ -33,7 +33,7 @@
 ################### End Gnulib section #########################
 
 modulesdir = $(pkgdatadir)/Texinfo/Convert/XSParagraph
-xsdir = $(pkglibexecdir)
+xsdir = $(pkglibdir)
 
 dist_modules_DATA = TestXS.pm
 

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2016-01-02 17:45:27 UTC (rev 6915)
+++ trunk/tp/texi2any.pl        2016-01-03 20:46:04 UTC (rev 6916)
@@ -55,10 +55,10 @@
   # These are substituted by the Makefile to create "texi2any".
   my $datadir = '@datadir@';
   my $package = '@PACKAGE@';
-  my $packagedir = '@pkglibexecdir@';
+  my $packagedir = '@pkglibdir@';
 
   if ($datadir eq '@' .'datadir@' or $package eq '@' . 'PACKAGE@'
-      or $packagedir eq '@' .'pkglibexecdir@'
+      or $packagedir eq '@' .'pkglibdir@'
       or defined($ENV{'TEXINFO_DEV_SOURCE'})
          and $ENV{'TEXINFO_DEV_SOURCE'} ne '0')
   {