diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-11-10 14:08:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-10 14:08:32 -0500 |
| commit | fd425d56a5680ab48d1cd03a140c249d90999a09 (patch) | |
| tree | f5d30a2cd368d89127dc742119aa3367f9abe2c9 /mesonbuild/backend/backends.py | |
| parent | dc10945ad7cd210426091a9e7809c90a9ff0b175 (diff) | |
| parent | c7226462a2d9cd45be406017592a3a5107b52642 (diff) | |
| download | meson-fd425d56a5680ab48d1cd03a140c249d90999a09.zip meson-fd425d56a5680ab48d1cd03a140c249d90999a09.tar.gz meson-fd425d56a5680ab48d1cd03a140c249d90999a09.tar.bz2 | |
Merge pull request #991 from mesonbuild/wip/tingping/gresource-depfile
gnome: Use depfile support of recent glib-compile-resources
Diffstat (limited to 'mesonbuild/backend/backends.py')
| -rw-r--r-- | mesonbuild/backend/backends.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 5cc2442..2861bb6 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -599,10 +599,7 @@ class Backend(): elif '@DEPFILE@' in i: if target.depfile is None: raise MesonException('Custom target %s has @DEPFILE@ but no depfile keyword argument.' % target.name) - if absolute_paths: - dfilename = os.path.join(self.get_target_private_dir_abs(target), target.depfile) - else: - dfilename = os.path.join(self.get_target_private_dir(target), target.depfile) + dfilename = os.path.join(outdir, target.depfile) i = i.replace('@DEPFILE@', dfilename) elif '@PRIVATE_OUTDIR_' in i: match = re.search('@PRIVATE_OUTDIR_(ABS_)?([-a-zA-Z0-9.@:]*)@', i) |