summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelle van der Waa <jelle@vdwaa.nl>2019-02-21 13:22:31 +0100
committerAllan McRae <allan@archlinux.org>2019-03-07 11:12:12 +1000
commit298bcf7986ca5500c8891ec412d65d8a8f5b9a4f (patch)
treea65fa7d57897dd4d6bfdd94cbf0f7f010a5cb125
parente03752e6adc86cbb4cb4f52a38f6e3e98cbe9dd5 (diff)
downloadpacman-298bcf7986ca5500c8891ec412d65d8a8f5b9a4f.tar.xz
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 <jelle@vdwaa.nl> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--doc/Makefile.am3
-rw-r--r--doc/meson.build1
-rw-r--r--doc/pacman.8.asciidoc2
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* <path>::
- 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