summaryrefslogtreecommitdiff
path: root/gnulib-tool.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 /gnulib-tool.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 'gnulib-tool.py')
-rwxr-xr-xgnulib-tool.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/gnulib-tool.py b/gnulib-tool.py
index 4e5a87d4f2..9c63f6147f 100755
--- a/gnulib-tool.py
+++ b/gnulib-tool.py
@@ -83,7 +83,7 @@ def main():
tests = None
libname = None
lgpl = None
- makefile = None
+ makefile_name = None
libtool = None
conddeps = None
macro_prefix = None
@@ -365,9 +365,9 @@ def main():
action='append',
choices=['2', '3orGPLv2', '3'],
nargs='?')
- # makefile
+ # makefile-name
parser.add_argument("--makefile-name",
- dest="makefile",
+ dest="makefile_name",
default=None,
type=str)
# single-configure
@@ -555,7 +555,7 @@ def main():
or cmdargs.excl_privileged_tests != None
or cmdargs.excl_unportable_tests != None
or cmdargs.avoids != None or cmdargs.lgpl != None
- or cmdargs.makefile != None))):
+ or cmdargs.makefile_name != None))):
message = '%s: *** ' % constants.APP['name']
message += 'invalid options for --%s mode\n' % mode
message += 'Try \'gnulib-tool --help\' for more information.\n'
@@ -629,7 +629,7 @@ def main():
if lgpl == None:
lgpl = True
libtool = cmdargs.libtool
- makefile = cmdargs.makefile
+ makefile_name = cmdargs.makefile_name
avoids = cmdargs.avoids
if avoids != None:
avoids = [ module
@@ -655,7 +655,7 @@ def main():
excl_test_categories=excl_test_categories,
libname=libname,
lgpl=lgpl,
- makefile=makefile,
+ makefile_name=makefile_name,
libtool=libtool,
conddeps=conddeps,
macro_prefix=macro_prefix,