[pacman-dev] [PATCH 1/2] meson: remove useless mkdir -p
directories are created by install_dir within the subdir custom_target installation targets. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- scripts/libmakepkg/meson.build | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/libmakepkg/meson.build b/scripts/libmakepkg/meson.build index bfba56a5..b0697f78 100644 --- a/scripts/libmakepkg/meson.build +++ b/scripts/libmakepkg/meson.build @@ -11,8 +11,6 @@ libmakepkg_modules = [ { 'name' : 'util', 'has_subdir' : true }, ] -mkdir_p = 'mkdir -p $DESTDIR/@0@' - foreach module : libmakepkg_modules custom_target( 'libmakepkg_@0@'.format(module['name']), @@ -24,10 +22,5 @@ foreach module : libmakepkg_modules if module.get('has_subdir', false) subdir(module['name']) - path = join_paths(get_option('prefix'), - get_option('datadir'), - 'makepkg', - module['name']) - meson.add_install_script('sh', '-c', mkdir_p.format(path)) endif endforeach -- 2.20.0
This was neglected in the initial meson port. We need these directories to exist in order to bootstrap a new installation. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> --- meson.build | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/meson.build b/meson.build index 394bd1f5..138a1934 100644 --- a/meson.build +++ b/meson.build @@ -436,6 +436,15 @@ install_data( 'proto/proto.install', install_dir : join_paths(DATAROOTDIR, 'pacman')) +foreach path : [ + join_paths(LOCALSTATEDIR, 'lib/pacman/'), + join_paths(LOCALSTATEDIR, 'cache/pacman/pkg/'), + join_paths(DATAROOTDIR, 'makepkg-template/'), + join_paths(DATAROOTDIR, 'libalpm/hooks/'), + ] + meson.add_install_script('sh', '-c', 'mkdir -p "$DESTDIR/@0@"'.format(path)) +endforeach + TEST_ENV = environment() TEST_ENV.set('PMTEST_SCRIPTLIB_DIR', join_paths(meson.source_root(), 'scripts/library/')) TEST_ENV.set('PMTEST_LIBMAKEPKG_DIR', join_paths(meson.build_root(), 'scripts/libmakepkg/')) -- 2.20.0
participants (1)
-
Eli Schwartz