diff options
| author | Staz M <staz@staz.io> | 2022-06-14 15:56:44 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2022-06-17 18:56:38 -0400 |
| commit | 7da495f616c6aa9363623a5447f897299ad872a4 (patch) | |
| tree | 45581ac9a5bffd551c49ca1f65a5e18be83891b9 /mesonbuild/scripts | |
| parent | 807cbcb350d2a0255cc71f753cce980a081289fb (diff) | |
| download | meson-7da495f616c6aa9363623a5447f897299ad872a4.zip meson-7da495f616c6aa9363623a5447f897299ad872a4.tar.gz meson-7da495f616c6aa9363623a5447f897299ad872a4.tar.bz2 | |
always set DESTDIR via the environment for external projects
It doesn't matter whether it is make or not, because make, too, supports
setting it via the env. This reduces the use of special cases in the
code.
Diffstat (limited to 'mesonbuild/scripts')
| -rw-r--r-- | mesonbuild/scripts/externalproject.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/scripts/externalproject.py b/mesonbuild/scripts/externalproject.py index 9650dc2..6849282 100644 --- a/mesonbuild/scripts/externalproject.py +++ b/mesonbuild/scripts/externalproject.py @@ -65,10 +65,7 @@ class ExternalProject: install_cmd = self.make.copy() install_env = {} - if is_make: - install_cmd.append(f'DESTDIR={self.install_dir}') - else: - install_env['DESTDIR'] = self.install_dir + install_env['DESTDIR'] = self.install_dir install_cmd.append('install') rc = self._run('install', install_cmd, install_env) if rc != 0: |