]> git.ipfire.org Git - thirdparty/libvirt.git/commit
build: use common .in replacement mechanism
authorEric Blake <eblake@redhat.com>
Fri, 4 Jan 2013 20:35:04 +0000 (13:35 -0700)
committerEric Blake <eblake@redhat.com>
Mon, 7 Jan 2013 18:26:52 +0000 (11:26 -0700)
commitb8279deda7b6e05f04c43dc7fd833fece83ad8ac
tree013f389032ff5cfaf77597b4c150d66a15216733
parent2b47328d44b2a14b8148905f49589d5371b2a79d
build: use common .in replacement mechanism

We had several different styles of .in conversion in our Makefiles:
ALLCAPS, @ALLCAPS@, @lower@, ::lower::
Canonicalize on one form, to make it easier to copy and paste
between .in files.

Also, we were using some non-portable sed constructs: \@ is an
undefined escape sequence (it happens to be @ itself in GNU sed,
but POSIX allows it to mean something else), as well as risky
behavior (failure to consistently quote things means a space
in $(sysconfdir) could throw things off; also, Autoconf recommends
using | rather than , or ! in the s||| operator, because | has to
be quoted in shell and is therefore less likely to appear in file
names than , or !).

Fix all of these uses to follow the same syntax.

* daemon/libvirtd.8.in: Switch to @var@.
* tools/virt-xml-validate.in: Likewise.
* tools/virt-pki-validate.in: Likewise.
* src/locking/virtlockd.init.in: Likewise.
* daemon/Makefile.am: Prefer | over ! in sed.
(libvirtd.8): Prefer consistent substitution.
(libvirtd.init, libvirtd.service): Avoid non-portable sed.
* tools/Makefile.am (libvirt-guests.sh, libvirt-guests.init)
(libvirt-guests.service): Likewise.
(virt-xml-validate, virt-pki-validate, virt-sanlock-cleanup):
Prefer consistent capitalization.
* src/Makefile.am (virtlockd.init, virtlockd.service)
(virtlockd.socket): Prefer consistent substitution.
(cherry picked from commit 462a69621e232c83990dbe6a711326b671262d47)

Conflicts:
daemon/Makefile.am - drop files not present in 0.10.2
src/Makefile.am - likewise
src/locking/virtlockd.init.in - likewise
daemon/Makefile.am
src/Makefile.am
tools/Makefile.am
tools/virt-pki-validate.in
tools/virt-sanlock-cleanup.in
tools/virt-xml-validate.in