681eb9cf2b
In particular, use /lib/systemd instead of /usr/lib/systemd in distributions like Debian which still have not adopted a /usr merge setup. Use XML entities from man/custom-entities.ent to replace configured paths while doing XSLT processing of the original XML files. There was precedent of some files (such as systemd.generator.xml) which were already using this approach. This addresses most of the (manual) fixes from this patch: http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/patches/Fix-paths-in-man-pages.patch?h=experimental-220 The idea of using generic XML entities was presented here: http://lists.freedesktop.org/archives/systemd-devel/2015-May/032240.html This patch solves almost all the issues, with the exception of: - Path to /bin/mount and /bin/umount. - Generic statements about preference of /lib over /etc. These will be handled separately by follow up patches. Tested: - With default configure settings, ran "make install" to two separate directories and compared the output to confirm they matched exactly. - Used a set of configure flags including $CONFFLAGS from Debian: http://anonscm.debian.org/cgit/pkg-systemd/systemd.git/tree/debian/rules Installed the tree and confirmed the paths use /lib/systemd instead of /usr/lib/systemd and that no other unexpected differences exist. - Confirmed that `make distcheck` still passes.
43 lines
1.1 KiB
XML
43 lines
1.1 KiB
XML
<?xml version="1.0"?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*-->
|
|
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
|
|
"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
|
|
<!ENTITY % entities SYSTEM "custom-entities.ent" >
|
|
%entities;
|
|
]>
|
|
|
|
<variablelist>
|
|
<varlistentry id='help'>
|
|
<term><option>-h</option></term>
|
|
<term><option>--help</option></term>
|
|
|
|
<listitem id='help-text'>
|
|
<para>Print a short help text and exit.
|
|
</para></listitem>
|
|
</varlistentry>
|
|
|
|
<varlistentry id='version'>
|
|
<term><option>--version</option></term>
|
|
|
|
<listitem id='version-text'>
|
|
<para>Print a short version string and exit.</para>
|
|
</listitem>
|
|
</varlistentry>
|
|
|
|
<varlistentry id='no-pager'>
|
|
<term><option>--no-pager</option></term>
|
|
|
|
<listitem>
|
|
<para>Do not pipe output into a pager.</para>
|
|
</listitem>
|
|
</varlistentry>
|
|
|
|
<varlistentry id='no-legend'>
|
|
<term><option>--no-legend</option></term>
|
|
|
|
<listitem>
|
|
<para>Do not print the legend, i.e. column headers and the
|
|
footer with hints.</para>
|
|
</listitem>
|
|
</varlistentry>
|
|
</variablelist>
|