[8068] ModulePath.pm

[gavinsmith0123]

Revision: 8068
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8068
Author:   gavin
Date:     2018-08-15 08:09:43 -0400 (Wed, 15 Aug 2018)
Log Message:
-----------
ModulePath.pm

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-08-15 10:42:07 UTC (rev 8067)
+++ trunk/ChangeLog     2018-08-15 12:09:43 UTC (rev 8068)
@@ -1,5 +1,11 @@
 2018-08-15  Gavin Smith  <address@hidden>
 
+       * tp/Texinfo/ModulePath.pm.in: Do not account for the case of 
+       one of $top_builddir and $top_srcdir being set but not the 
+       other.
+
+2018-08-15  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/XS/Makefile.am: Do not install TestXS.pm, as this 
        is useless.
 

Modified: trunk/tp/Texinfo/ModulePath.pm.in
===================================================================
--- trunk/tp/Texinfo/ModulePath.pm.in   2018-08-15 10:42:07 UTC (rev 8067)
+++ trunk/tp/Texinfo/ModulePath.pm.in   2018-08-15 12:09:43 UTC (rev 8068)
@@ -40,13 +40,8 @@
       $top_srcdir = File::Spec->catdir($top_srcdir, $updir);
     }
     $ENV{'top_srcdir'} = $top_srcdir;
+    $ENV{'top_builddir'} = $top_srcdir;
   }
-
-  if (defined($ENV{'top_builddir'}) and !defined($ENV{'top_srcdir'})) {
-    $ENV{'top_srcdir'} = $ENV{'top_builddir'};
-  } elsif (!defined($ENV{'top_builddir'}) and defined($ENV{'top_srcdir'})) {
-    $ENV{'top_builddir'} = $ENV{'top_srcdir'};
-  }
    
   if (!$lib_dir) {
     if (defined($ENV{'top_srcdir'})) {