diff options
| author | Filipe Brandenburger <filbranden@google.com> | 2015-05-27 02:38:19 -0700 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-05-28 19:28:19 +0200 |
| commit | 681eb9cf2b831293a4f3d4c48a748d2e4a25d69e (patch) | |
| tree | 9293679b667f4d0dd0c525913b5d0ede61460550 /man/coredump.conf.xml | |
| parent | 5f529f4c97a141457301477505ae7eb4c28cf610 (diff) | |
| download | systemd-681eb9cf2b831293a4f3d4c48a748d2e4a25d69e.tar.gz systemd-681eb9cf2b831293a4f3d4c48a748d2e4a25d69e.tar.bz2 systemd-681eb9cf2b831293a4f3d4c48a748d2e4a25d69e.zip | |
man: generate configured paths in manpages
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.
Diffstat (limited to 'man/coredump.conf.xml')
| -rw-r--r-- | man/coredump.conf.xml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/man/coredump.conf.xml b/man/coredump.conf.xml index fd54c59e6b..4c65c1cf03 100644 --- a/man/coredump.conf.xml +++ b/man/coredump.conf.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY % entities SYSTEM "custom-entities.ent" > +%entities; +]> <!-- This file is part of systemd. @@ -49,10 +52,10 @@ </refnamediv> <refsynopsisdiv> - <para><filename>/etc/systemd/coredump.conf</filename></para> - <para><filename>/etc/systemd/coredump.conf.d/*.conf</filename></para> + <para><filename>&pkgsysconfdir;/coredump.conf</filename></para> + <para><filename>&pkgsysconfdir;/coredump.conf.d/*.conf</filename></para> <para><filename>/run/systemd/coredump.conf.d/*.conf</filename></para> - <para><filename>/usr/lib/systemd/coredump.conf.d/*.conf</filename></para> + <para><filename>&rootlibexecdir;/coredump.conf.d/*.conf</filename></para> </refsynopsisdiv> <refsect1> |