From 681eb9cf2b831293a4f3d4c48a748d2e4a25d69e Mon Sep 17 00:00:00 2001 From: Filipe Brandenburger Date: Wed, 27 May 2015 02:38:19 -0700 Subject: 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. --- man/udev.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'man/udev.xml') diff --git a/man/udev.xml b/man/udev.xml index d1a4f614cf..f7ebaad4bc 100644 --- a/man/udev.xml +++ b/man/udev.xml @@ -1,6 +1,9 @@ + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ + +%entities; +]> @@ -55,7 +58,7 @@ Rules Files The udev rules are read from the files located in the - system rules directory /usr/lib/udev/rules.d, + system rules directory &udevlibexecdir;/rules.d, the volatile runtime directory /run/udev/rules.d and the local administration directory /etc/udev/rules.d. All rules files are collectively sorted and processed in lexical order, @@ -421,7 +424,7 @@ Execute an external program specified as the assigned value. If no absolute path is given, the program is expected - to live in /usr/lib/udev; otherwise, the + to live in &udevlibexecdir;; otherwise, the absolute path must be specified. This is the default if no type is specified. -- cgit v1.2.3-54-g00ecf