diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rwxr-xr-x | gnulib-tool.py | 10 |
2 files changed, 10 insertions, 4 deletions
@@ -1,5 +1,9 @@ 2022-08-05 Bruno Haible <bruno@clisp.org> + gnulib-tool.py: Refactor --makefile-name option. + * gnulib-tool.py (main): Handle option --makefile-name like all other + string-valued options. + gnulib-tool.py: Implement option --no-libtool. * gnulib-tool.py (main): Accept option --no-libtool. diff --git a/gnulib-tool.py b/gnulib-tool.py index f11c7bd5cb..ba15ba7154 100755 --- a/gnulib-tool.py +++ b/gnulib-tool.py @@ -314,9 +314,9 @@ def main(): action='store_true') # avoids parser.add_argument('--avoid', - action='append', dest='avoids', default=None, + action='append', nargs=1) # libtool parser.add_argument('--libtool', @@ -370,10 +370,10 @@ def main(): choices=['2', '3orGPLv2', '3'], nargs='?') # makefile-name - parser.add_argument("--makefile-name", - dest="makefile_name", + parser.add_argument('--makefile-name', + dest='makefile_name', default=None, - type=str) + nargs=1) # single-configure parser.add_argument('--single-configure', dest='single_configure', @@ -634,6 +634,8 @@ def main(): lgpl = True libtool = cmdargs.libtool makefile_name = cmdargs.makefile_name + if makefile_name != None: + makefile_name = makefile_name[0] avoids = cmdargs.avoids if avoids != None: avoids = [ module |