diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/build.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/fs.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/i18n.py | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index eb18d84..60cd0cf 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -2416,7 +2416,7 @@ class CustomTarget(Target, CommandBase): env: T.Optional[EnvironmentVariables] = None, feed: bool = False, install: bool = False, - install_dir: T.Optional[T.Sequence[T.Union[str, Literal[False]]]] = None, + install_dir: T.Optional[T.List[T.Union[str, Literal[False]]]] = None, install_mode: T.Optional[FileMode] = None, install_tag: T.Optional[T.List[T.Optional[str]]] = None, absolute_paths: bool = False, diff --git a/mesonbuild/modules/fs.py b/mesonbuild/modules/fs.py index eb19ec4..7d96995 100644 --- a/mesonbuild/modules/fs.py +++ b/mesonbuild/modules/fs.py @@ -302,7 +302,7 @@ class FSModule(ExtensionModule): [dest], build_by_default=True, install=kwargs['install'], - install_dir=kwargs['install_dir'], + install_dir=[kwargs['install_dir']], install_mode=kwargs['install_mode'], install_tag=[kwargs['install_tag']], backend=state.backend, diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 2a7a9ad..fcb0aa7 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -189,7 +189,6 @@ class I18nModule(ExtensionModule): if build_by_default is None: build_by_default = kwargs['install'] - install_dir = [kwargs['install_dir']] if kwargs['install_dir'] is not None else None install_tag = [kwargs['install_tag']] if kwargs['install_tag'] is not None else None ct = build.CustomTarget( @@ -202,7 +201,7 @@ class I18nModule(ExtensionModule): [kwargs['output']], build_by_default=build_by_default, install=kwargs['install'], - install_dir=install_dir, + install_dir=[kwargs['install_dir']] if kwargs['install_dir'] is not None else None, install_tag=install_tag, ) @@ -367,7 +366,6 @@ class I18nModule(ExtensionModule): if build_by_default is None: build_by_default = kwargs['install'] - install_dir = [kwargs['install_dir']] if kwargs['install_dir'] is not None else None install_tag = [kwargs['install_tag']] if kwargs['install_tag'] is not None else None ct = build.CustomTarget( @@ -381,7 +379,7 @@ class I18nModule(ExtensionModule): build_by_default=build_by_default, extra_depends=mo_targets, install=kwargs['install'], - install_dir=install_dir, + install_dir=[kwargs['install_dir']] if kwargs['install_dir'] is not None else None, install_tag=install_tag, ) |