On 01/04/2013 11:14 AM, Jim Fehlig wrote:
The makefile rule substitutes variables delimited by '::',
but the
virtlockd service files uses '@'. Change the service file to
match the makefile rule.
I'd much rather see us unify the different makefile .in conversions to
use the same syntax - I see:
libvirtd.8.in: s!SYSCONFDIR!$(sysconfdir)!g
libvirtd.policy.in, libvirtd.logrotate.in, libvirtd.qemu.logrotate.in,
...: s![@]authaction[@]!$(policyauth)!g
libvirtd.init.in, libvirtd.service.in:
s!\@localstatedir\@!$(localstatedir)!g
(hmm, \@ is not a portable regex, and may die on some platforms)
virtlockd.init.in: s!::localstatedir::!$(localstatedir)!g
That is, I think the most common style is using @var@ in the file being
replaces, and using [@]var[@] in the makefile, and the outliers
(libvirtd.8 with ALLCAPS instead of @var@, and virtlockd with ::var::
instead of @var@) are best converted over to the common format.
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library
http://libvirt.org