1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
| | diff --git a/doc/meson.build b/doc/meson.build
index 5a8eb3a4..74ccf53e 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -100,7 +100,7 @@ foreach page: manpages + sitepages
endforeach
run_target('html',
- command : ['/bin/true'],
+ command : ['true'],
depends : html_targets)
custom_target(
diff --git a/meson.build b/meson.build
index 37523b01..6c568020 100644
--- a/meson.build
+++ b/meson.build
@@ -396,13 +396,13 @@ configure_file(
input : 'etc/makepkg.conf.in',
output : 'makepkg.conf',
configuration : substs,
- install_dir : SYSCONFDIR)
+ install_dir : join_paths(PREFIX, 'etc'))
configure_file(
input : 'etc/pacman.conf.in',
output : 'pacman.conf',
configuration : substs,
- install_dir : SYSCONFDIR)
+ install_dir : join_paths(PREFIX, 'etc'))
install_data(
'proto/PKGBUILD-split.proto',
@@ -411,14 +411,6 @@ 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/'))
|