From 298bcf7986ca5500c8891ec412d65d8a8f5b9a4f Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Thu, 21 Feb 2019 13:22:31 +0100 Subject: doc: set rootdir correctly in man pages If an alternative rootdir is specified in either meson or configure it's not respected in the generated man pages. Signed-off-by: Jelle van der Waa Signed-off-by: Allan McRae --- doc/Makefile.am | 3 ++- doc/meson.build | 1 + doc/pacman.8.asciidoc | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index de87c409..e03d6ab8 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -112,7 +112,8 @@ ASCIIDOC_OPTS = \ -a pkgdatadir=$(pkgdatadir) \ -a localstatedir=$(localstatedir) \ -a sysconfdir=$(sysconfdir) \ - -a datarootdir=$(datarootdir) + -a datarootdir=$(datarootdir) \ + -a rootdir=$(ROOTDIR) A2X_OPTS = \ --no-xmllint \ diff --git a/doc/meson.build b/doc/meson.build index b7514ef7..d6403bae 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -31,6 +31,7 @@ asciidoc_opts = [ '-a', 'localstatedir=@0@'.format(LOCALSTATEDIR), '-a', 'sysconfdir=@0@'.format(SYSCONFDIR), '-a', 'datarootdir=@0@'.format(DATAROOTDIR), + '-a', 'rootdir=@0@'.format(ROOTDIR), ] html_targets = [] diff --git a/doc/pacman.8.asciidoc b/doc/pacman.8.asciidoc index 6b2d9172..fe95178d 100644 --- a/doc/pacman.8.asciidoc +++ b/doc/pacman.8.asciidoc @@ -131,7 +131,7 @@ Options not automatically prepended. *-r, \--root* :: - Specify an alternative installation root (default is `/`). This should + Specify an alternative installation root (default is +{rootdir}+). This should not be used as a way to install software into `/usr/local` instead of `/usr`. *NOTE*: If database path or log file are not specified on either the -- cgit v1.2.3-54-g00ecf