summaryrefslogtreecommitdiff
path: root/pygnulib/GLMakefileTable.py
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2022-08-05 23:15:39 +0200
committerBruno Haible <bruno@clisp.org>2022-08-05 23:15:39 +0200
commitad534101bdf0b188babd525c4d54c9bf250763f7 (patch)
treef9e3d9c479a5521a3948bdc63b5d669192cccd0c /pygnulib/GLMakefileTable.py
parent7a106efa3268cad77c6b21b798296284923b4a2f (diff)
downloadgnulib-ad534101bdf0b188babd525c4d54c9bf250763f7.tar.gz
gnulib-tool.py: Refactor --makefile-name option.
* gnulib-tool.py (main): Rename variable 'makefile' to 'makefile_name'. * pygnulib/GLConfig.py: Rename attribute 'makefile' to 'makefile_name'. * pygnulib/GLMakefileTable.py: Update. * pygnulib/GLEmiter.py: Likewise. * pygnulib/GLImport.py: Likewise. * pygnulib/GLFileSystem.py (GLFileAssistant): Remove unused assignment.
Diffstat (limited to 'pygnulib/GLMakefileTable.py')
-rw-r--r--pygnulib/GLMakefileTable.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/pygnulib/GLMakefileTable.py b/pygnulib/GLMakefileTable.py
index abaeaf9d2e..d23f5710cb 100644
--- a/pygnulib/GLMakefileTable.py
+++ b/pygnulib/GLMakefileTable.py
@@ -81,18 +81,18 @@ class GLMakefileTable(object):
Add a special row to Makefile.am table with the first parent directory
which contains or will contain Makefile.am file.
GLConfig: sourcebase, m4base, testsbase, incl_test_categories,
- excl_test_categories, makefile.'''
+ excl_test_categories, makefile_name.'''
m4base = self.config['m4base']
sourcebase = self.config['sourcebase']
testsbase = self.config['testsbase']
- makefile = self.config['makefile']
+ makefile_name = self.config['makefile_name']
inctests = self.config.checkInclTestCategory(TESTS['tests'])
dir1 = '%s%s' % (m4base, os.path.sep)
mfd = 'Makefile.am'
- if not makefile:
+ if not makefile_name:
mfx = 'Makefile.am'
- else: # if makefile
- mfx = makefile
+ else: # if makefile_name
+ mfx = makefile_name
dir2 = ''
while (dir1
and (joinpath(self.config['destdir'], dir1, mfd)