[systemd-devel] [PATCH 0/2] Using XML entities for paths in manpages

Lennart Poettering lennart at poettering.net
Fri May 29 09:58:51 PDT 2015


On Fri, 29.05.15 11:05, Daniel Mack (daniel at zonque.org) wrote:

> On 05/29/2015 05:18 AM, Michael Biebl wrote:
> > 2015-05-28 19:47 GMT+02:00 Filipe Brandenburger <filbranden at google.com>:
> >> We're actually still missing a small part of it (A sentence like
> >> "Files in /etc have the highest priority, files in /run take
> >> precedence over files with the same name in */usr/lib*." in files like
> >> hwdb.xml, the last /usr/lib won't get fixed) but it requires new
> >> variables. I'm leaning towards introducing a rootsysconfdir=/etc and
> >> rootlibdir=$(rootprefix)/lib (we already have a rootbindir) so I'll
> >> follow up with a patch doing that.
> >>
> >> Though having the first patchset in certainly helps.
> > 
> > Indeed. I just ran my small shell script which I used to generate the
> > original diff over current git head.
> > The only occurences which it still replaces can be found at [1].
> > It's like you said, the override bits which are still missing.
> > Otherwise it looks fine.
> 
> Could you try the attached patch?
> 
> I had to introduce a new entity in custom-entites.ent, because with
> "--with-rootprefix=/", "&rootprefix;/lib" resolves to "//lib", and with
> the default behaviour of configure, "&rootprefix;lib" becomes "/usrlib".
> 
> That is solved with a subsitiution in Makefile.am now, which cleans up
> all double slashes in custom-entites.ent.

Patch looks fine to me. Didn't test it though, Michael, Filipe or
Martin should probably try that...

Lennart

-- 
Lennart Poettering, Red Hat


More information about the systemd-devel mailing list