diff options
| author | Philip Chimento <philip.chimento@gmail.com> | 2022-11-06 17:23:01 -0800 |
|---|---|---|
| committer | Philip Chimento <philip.chimento@gmail.com> | 2023-02-19 21:25:18 -0800 |
| commit | 949dfdedff69f1d56564eca9bf62f56878702d02 (patch) | |
| tree | 76766010a2642f976688b36fae549f3f10b1ba0d | |
| parent | 7fb3309e61984961602b085445df20073019ed7c (diff) | |
| download | gjs-949dfdedff69f1d56564eca9bf62f56878702d02.tar.gz | |
build: Remove redundant checks for absolute paths
Path concatenation with / already handles absolute paths correctly if
the right-hand side is an absolute path.
Thanks to Eli Schwartz for pointing this out.
| -rw-r--r-- | meson.build | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 45bc57e8..af2c74f2 100644 --- a/meson.build +++ b/meson.build @@ -14,7 +14,6 @@ project('gjs', 'cpp', 'c', version: '1.75.1', license: ['MIT', 'LGPL2+'], api_version = '1.0' api_name = '@0@-@1@'.format(meson.project_name(), api_version) -fs = import('fs') gnome = import('gnome') pkg = import('pkgconfig') @@ -771,9 +770,9 @@ libdir = get_option('libdir') datadir = get_option('datadir') summary({ 'prefix': prefix, - 'bindir': fs.is_absolute(bindir) ? bindir : prefix / bindir, - 'libdir': fs.is_absolute(libdir) ? libdir : prefix / libdir, - 'datadir': fs.is_absolute(datadir) ? datadir : prefix / datadir, + 'bindir': prefix / bindir, + 'libdir': prefix / libdir, + 'datadir': prefix / datadir, }, section: 'Directories') locations = [] foreach dep: [ffi, glib, gi, spidermonkey, readline, sysprof_capture] |