bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

doc: set rootdir correctly in man pages

Browse source 
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>
This commit is contained in:
Jelle van der Waa 2019-02-21 13:22:31 +01:00 • committed by Allan McRae
parent e03752e6ad
commit 298bcf7986
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/Makefile.am
View file

@ -112,7 +112,8 @@ ASCIIDOC_OPTS = \
-a pkgdatadir=$(pkgdatadir) \ -a pkgdatadir=$(pkgdatadir) \
-a localstatedir=$(localstatedir) \ -a localstatedir=$(localstatedir) \
-a sysconfdir=$(sysconfdir) \ -a sysconfdir=$(sysconfdir) \
-a datarootdir=$(datarootdir) -a datarootdir=$(datarootdir) \
-a rootdir=$(ROOTDIR)
A2X_OPTS = \ A2X_OPTS = \
--no-xmllint \ --no-xmllint \

1
doc/meson.build
View file

@ -31,6 +31,7 @@ asciidoc_opts = [
'-a', 'localstatedir=@0@'.format(LOCALSTATEDIR), '-a', 'localstatedir=@0@'.format(LOCALSTATEDIR),
'-a', 'sysconfdir=@0@'.format(SYSCONFDIR), '-a', 'sysconfdir=@0@'.format(SYSCONFDIR),
'-a', 'datarootdir=@0@'.format(DATAROOTDIR), '-a', 'datarootdir=@0@'.format(DATAROOTDIR),
'-a', 'rootdir=@0@'.format(ROOTDIR),
] ]
html_targets = [] html_targets = []

2
doc/pacman.8.asciidoc
View file

@ -131,7 +131,7 @@ Options
not automatically prepended. not automatically prepended.
*-r, \--root* <path>:: *-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 not be used as a way to install software into `/usr/local` instead of
`/usr`. `/usr`.
*NOTE*: If database path or log file are not specified on either the *NOTE*: If database path or log file are not specified on either the