diff options
| author | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2016-06-16 23:13:23 +0530 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-06-16 20:43:23 +0300 |
| commit | b2fb4f9d6634adb1e51d7d92075a548de9229ce5 (patch) | |
| tree | db8d6bcad51ca1aaf534f25cffa8eaee074d069b /mesonbuild/scripts/gettext.py | |
| parent | 217e0593ca3ad42aebdb5decfe3649abea45b957 (diff) | |
| download | meson-b2fb4f9d6634adb1e51d7d92075a548de9229ce5.zip meson-b2fb4f9d6634adb1e51d7d92075a548de9229ce5.tar.gz meson-b2fb4f9d6634adb1e51d7d92075a548de9229ce5.tar.bz2 | |
scripts: Use destdir_join fix for all DESTDIR prefixing (#598)
Diffstat (limited to 'mesonbuild/scripts/gettext.py')
| -rw-r--r-- | mesonbuild/scripts/gettext.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/scripts/gettext.py b/mesonbuild/scripts/gettext.py index d8b2a9c..4677d5f 100644 --- a/mesonbuild/scripts/gettext.py +++ b/mesonbuild/scripts/gettext.py @@ -15,6 +15,7 @@ # limitations under the License. import os, subprocess, shutil +from mesonbuild.scripts import destdir_join def run_potgen(src_sub, pkgname, args): listfile = os.path.join(src_sub, 'POTFILES') @@ -56,7 +57,8 @@ def run(args): langs = args[4:] src_sub = os.path.join(os.environ['MESON_SOURCE_ROOT'], subdir) bld_sub = os.path.join(os.environ['MESON_BUILD_ROOT'], subdir) - dest = os.environ.get('DESTDIR') + os.path.join(os.environ['MESON_INSTALL_PREFIX'], instsubdir) + destdir = os.environ.get('DESTDIR', '') + dest = destdir_join(destdir, os.path.join(os.environ['MESON_INSTALL_PREFIX'], instsubdir)) if gen_gmo(src_sub, bld_sub, langs) != 0: return 1 do_install(src_sub, bld_sub, dest, pkgname, langs) |