From ad534101bdf0b188babd525c4d54c9bf250763f7 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 5 Aug 2022 23:15:39 +0200
Subject: 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.
---
 gnulib-tool.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'gnulib-tool.py')

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,
-- 
cgit v1.2.1