From 01cd78f9d682ff75cc5ab1c2d21b911bdd9215b8 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sat, 13 Aug 2022 13:18:06 +0200
Subject: gnulib-tool.py: Reduce code duplication.

* pygnulib/constants.py (relinverse): New function.
* pygnulib/GLEmiter.py (GLEmiter.po_Makevars,
GLEmiter.tests_Makefile_am): Use it.
* pygnulib/GLTestDir.py (GLTestDir.execute): Likewise.
---
 pygnulib/GLTestDir.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'pygnulib/GLTestDir.py')

diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index bf00099283..68cc5ce411 100644
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -48,6 +48,7 @@ DIRS = constants.DIRS
 UTILS = constants.UTILS
 TESTS = constants.TESTS
 joinpath = constants.joinpath
+relinverse = constants.relinverse
 copyfile = constants.copyfile
 movefile = constants.movefile
 isdir = os.path.isdir
@@ -405,16 +406,7 @@ class GLTestDir(object):
                     file.write(emit)
                 # Viewed from the $testsbase subdirectory, $auxdir is different.
                 emit = ''
-                saved_auxdir = self.config['auxdir']
-                testsbase = '%s/' % os.path.normpath(testsbase)
-                counter = int()
-                auxdir = ''
-                finish = (len(testsbase.split('/')) - 1)
-                while counter < finish:
-                    auxdir += '../'
-                    counter += 1
-                auxdir = os.path.normpath(joinpath(auxdir, saved_auxdir))
-                testsbase = os.path.normpath(testsbase)
+                auxdir = os.path.normpath(joinpath(relinverse(testsbase), auxdir))
                 self.config.setAuxDir(auxdir)
                 # Create $testsbase/configure.ac.
                 emit += '# Process this file with autoconf '
-- 
cgit v1.2.1