Browse Source

improve path names for man pages and metainfo

Signed-off-by: Stephan Lachnit <stephanlachnit@protonmail.com>
Stephan Lachnit 4 years ago
parent
commit
d27f8caecc
2 changed files with 5 additions and 5 deletions
  1. 3 5
      data/meson.build
  2. 2 0
      meson.build

+ 3 - 5
data/meson.build

@@ -56,8 +56,6 @@ configure_file(
 )
 
 # Configure and install man pages
-mandir = join_paths(path_prefix, get_option('mandir'))
-
 gamemoded_manpage = configure_file(
     input: files('gamemoded.8.in'),
     output: 'gamemoded.8',
@@ -66,7 +64,7 @@ gamemoded_manpage = configure_file(
 
 install_man(
     gamemoded_manpage,
-    install_dir: mandir,
+    install_dir: path_mandir,
 )
 
 gamemoderun_manpage = configure_file(
@@ -77,7 +75,7 @@ gamemoderun_manpage = configure_file(
 
 install_man(
     gamemoderun_manpage,
-    install_dir: mandir,
+    install_dir: path_mandir,
 )
 
 # Install metainfo
@@ -85,7 +83,7 @@ metainfo_file = files('io.github.feralinteractive.gamemode.metainfo.xml')
 
 install_data(
     metainfo_file,
-    install_dir: join_paths(path_datadir, 'metainfo')
+    install_dir: path_metainfo,
 )
 
 # Validate metainfo

+ 2 - 0
meson.build

@@ -77,6 +77,8 @@ path_datadir = join_paths(path_prefix, get_option('datadir'))
 path_includedir = join_paths(path_prefix, get_option('includedir'))
 path_libdir = join_paths(path_prefix, get_option('libdir'))
 path_libexecdir = join_paths(path_prefix, get_option('libexecdir'))
+path_mandir = join_paths(path_prefix, get_option('mandir'))
+path_metainfo = join_paths(path_datadir, 'metainfo')
 path_sysconfdir = join_paths(path_prefix, get_option('sysconfdir'))
 
 # Find systemd / elogind via pkgconfig