[8090] fix ModulePath for make distcheck with parsetexi

[gavinsmith0123]

Revision: 8090
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8090
Author:   gavin
Date:     2018-08-16 07:49:34 -0400 (Thu, 16 Aug 2018)
Log Message:
-----------
fix ModulePath for make distcheck with parsetexi

Modified Paths:
--------------
    trunk/tp/Texinfo/ModulePath.pm.in

Modified: trunk/tp/Texinfo/ModulePath.pm.in
===================================================================
--- trunk/tp/Texinfo/ModulePath.pm.in   2018-08-16 09:26:10 UTC (rev 8089)
+++ trunk/tp/Texinfo/ModulePath.pm.in   2018-08-16 11:49:34 UTC (rev 8090)
@@ -70,19 +70,18 @@
     }
   }
 
-  if (!$libexec_dir) {
-    # XSParagraph.la is generated in the build directory.
+  if (defined($libexec_dir)) {
+    unshift @INC, $libexec_dir;
+  } else {
+    # *.la files are generated in the build directory.
     if (defined($ENV{'top_builddir'})) {
-      $libexec_dir = File::Spec->catdir($ENV{'top_builddir'}, 'tp',
+      unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp',
         'Texinfo', 'XS');
+      unshift @INC, File::Spec->catdir($ENV{'top_builddir'}, 'tp',
+        'Texinfo', 'XS', 'parsetexi');
     }
-    unshift @INC, (File::Spec->catdir($lib_dir, '..', 'Texinfo', 'XS', 
'parsetexi'));
   }
 
-  if (defined($libexec_dir)) {
-    unshift @INC, (File::Spec->catdir($libexec_dir));
-  }
-
   if ($ENV{TEXINFO_XS_PARSER}) {
     unshift @INC, sub { 
       my ($coderef, $filename) = @_;