diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2018-12-10 23:47:58 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2018-12-12 10:13:26 +1000 |
| commit | b109d7096b3f3f3244b7bb3796be658393eff98a (patch) | |
| tree | 72a8f9fcac52aea15ed61aba418b28de1778a8ea | |
| parent | 77b8ca70322a121a2efb5318042e664246d3ec0e (diff) | |
| download | pacman-b109d7096b3f3f3244b7bb3796be658393eff98a.tar.xz | |
meson: add trailing slashes to directory components in configuration defines
This matches what we currently do in the autotools build configuration,
and ensures that the default pacman-conf definitions for unspecified
values consistently end with the trailing directory slashes.
This has ramifications for thirdparty tools that up to now, have relied
on this slash being there. Those tools should be fixed to prevent
breaking when custom locations are set, but this is no reason not to fix
it on our end as well. An extra trailng slash should never cause harm.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | meson.build | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meson.build b/meson.build index 138a1934..0a710653 100644 --- a/meson.build +++ b/meson.build @@ -72,10 +72,10 @@ conf.set_quoted('LDCONFIG', LDCONFIG) conf.set_quoted('LIB_VERSION', meson.project_version()) conf.set_quoted('SYSHOOKDIR', join_paths(DATAROOTDIR, 'libalpm/hooks/')) conf.set_quoted('CONFFILE', join_paths(SYSCONFDIR, 'pacman.conf')) -conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman')) -conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg')) +conf.set_quoted('DBPATH', join_paths(LOCALSTATEDIR, 'lib/pacman/')) +conf.set_quoted('GPGDIR', join_paths(SYSCONFDIR, 'pacman.d/gnupg/')) conf.set_quoted('LOGFILE', join_paths(LOCALSTATEDIR, 'log/pacman.log')) -conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg')) +conf.set_quoted('CACHEDIR', join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/')) conf.set_quoted('HOOKDIR', join_paths(SYSCONFDIR, 'pacman.d/hooks/')) conf.set_quoted('ROOTDIR', ROOTDIR) |