mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-28 16:45:26 +00:00
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 462a69621e)
Conflicts:
daemon/Makefile.am - drop files not present in 0.10.2
src/Makefile.am - likewise
src/locking/virtlockd.init.in - likewise
This commit is contained in:
Eric Blake
parent
2b47328d44
commit
b8279deda7
@ -1,6 +1,6 @@
|
|||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
## Copyright (C) 2005-2012 Red Hat, Inc.
|
## Copyright (C) 2005-2013 Red Hat, Inc.
|
||||||
## See COPYING.LIB for the License of this software
|
## See COPYING.LIB for the License of this software
|
||||||
|
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
@ -85,8 +85,8 @@ CLEANFILES += test_libvirtd.aug
|
|||||||
|
|
||||||
libvirtd.8: $(srcdir)/libvirtd.8.in
|
libvirtd.8: $(srcdir)/libvirtd.8.in
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e 's!SYSCONFDIR!$(sysconfdir)!g' \
|
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
|
||||||
-e 's!LOCALSTATEDIR!$(localstatedir)!g' \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
||||||
@ -216,25 +216,25 @@ BUILT_SOURCES += $(LOGROTATE_CONFS)
|
|||||||
|
|
||||||
libvirtd.logrotate: libvirtd.logrotate.in
|
libvirtd.logrotate: libvirtd.logrotate.in
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e 's![@]localstatedir[@]!$(localstatedir)!g' \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
||||||
libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
|
libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e 's![@]localstatedir[@]!$(localstatedir)!g' \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
||||||
libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
|
libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e 's![@]localstatedir[@]!$(localstatedir)!g' \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
||||||
libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
|
libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e 's![@]localstatedir[@]!$(localstatedir)!g' \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
||||||
@ -334,21 +334,21 @@ uninstall-init-systemd:
|
|||||||
endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
|
endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
|
|
||||||
libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
|
libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e s!\@localstatedir\@!$(localstatedir)!g \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
-e s!\@sbindir\@!$(sbindir)!g \
|
-e 's|[@]sbindir[@]|$(sbindir)|g' \
|
||||||
-e s!\@sysconfdir\@!$(sysconfdir)!g \
|
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
chmod a+x $@-t && \
|
chmod a+x $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
||||||
libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
|
libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e s!\@localstatedir\@!$(localstatedir)!g \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
-e s!\@sbindir\@!$(sbindir)!g \
|
-e 's|[@]sbindir[@]|$(sbindir)|g' \
|
||||||
-e s!\@sysconfdir\@!$(sysconfdir)!g \
|
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
chmod a+x $@-t && \
|
chmod a+x $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
## Copyright (C) 2005-2012 Red Hat, Inc.
|
## Copyright (C) 2005-2013 Red Hat, Inc.
|
||||||
## See COPYING.LIB for the License of this software
|
## See COPYING.LIB for the License of this software
|
||||||
|
|
||||||
# No libraries with the exception of LIBXML should be listed
|
# No libraries with the exception of LIBXML should be listed
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
## Copyright (C) 2005-2012 Red Hat, Inc.
|
## Copyright (C) 2005-2013 Red Hat, Inc.
|
||||||
## See COPYING.LIB for the License of this software
|
## See COPYING.LIB for the License of this software
|
||||||
|
|
||||||
INCLUDES = \
|
INCLUDES = \
|
||||||
@ -58,7 +58,7 @@ dist_man8_MANS = virt-sanlock-cleanup.8
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
virt-xml-validate: virt-xml-validate.in Makefile
|
virt-xml-validate: virt-xml-validate.in Makefile
|
||||||
$(AM_V_GEN)sed -e 's,[@]SCHEMADIR@,$(pkgdatadir)/schemas,' < $< > $@ \
|
$(AM_V_GEN)sed -e 's|[@]schemadir@|$(pkgdatadir)/schemas|' < $< > $@ \
|
||||||
|| (rm $@ && exit 1) && chmod +x $@
|
|| (rm $@ && exit 1) && chmod +x $@
|
||||||
|
|
||||||
virt-xml-validate.1: virt-xml-validate.in
|
virt-xml-validate.1: virt-xml-validate.in
|
||||||
@ -67,7 +67,7 @@ virt-xml-validate.1: virt-xml-validate.in
|
|||||||
rm $(srcdir)/$@; exit 1; fi
|
rm $(srcdir)/$@; exit 1; fi
|
||||||
|
|
||||||
virt-pki-validate: virt-pki-validate.in Makefile
|
virt-pki-validate: virt-pki-validate.in Makefile
|
||||||
$(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' < $< > $@ \
|
$(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' < $< > $@ \
|
||||||
|| (rm $@ && exit 1) && chmod +x $@
|
|| (rm $@ && exit 1) && chmod +x $@
|
||||||
|
|
||||||
virt-pki-validate.1: virt-pki-validate.in
|
virt-pki-validate.1: virt-pki-validate.in
|
||||||
@ -81,8 +81,8 @@ virt-host-validate.1: virt-host-validate.c
|
|||||||
rm $(srcdir)/$@; exit 1; fi
|
rm $(srcdir)/$@; exit 1; fi
|
||||||
|
|
||||||
virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
|
virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
|
||||||
$(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' \
|
$(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' \
|
||||||
-e 's,[@]LOCALSTATEDIR@,$(localstatedir),' < $< > $@ \
|
-e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \
|
||||||
|| (rm $@ && exit 1) && chmod +x $@
|
|| (rm $@ && exit 1) && chmod +x $@
|
||||||
|
|
||||||
virt-sanlock-cleanup.8: virt-sanlock-cleanup.in
|
virt-sanlock-cleanup.8: virt-sanlock-cleanup.in
|
||||||
@ -210,21 +210,21 @@ uninstall-init:
|
|||||||
endif # LIBVIRT_INIT_SCRIPT_RED_HAT
|
endif # LIBVIRT_INIT_SCRIPT_RED_HAT
|
||||||
|
|
||||||
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e 's!\@PACKAGE\@!$(PACKAGE)!g' \
|
-e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \
|
||||||
-e 's!\@bindir\@!$(bindir)!g' \
|
-e 's|[@]bindir[@]|$(bindir)|g' \
|
||||||
-e 's!\@localedir\@!$(localedir)!g' \
|
-e 's|[@]localedir[@]|$(localedir)|g' \
|
||||||
-e 's!\@localstatedir\@!$(localstatedir)!g' \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
-e 's!\@sbindir\@!$(sbindir)!g' \
|
-e 's|[@]sbindir[@]|$(sbindir)|g' \
|
||||||
-e 's!\@sysconfdir\@!$(sysconfdir)!g' \
|
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
chmod a+x $@-t && \
|
chmod a+x $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
BUILT_SOURCES += libvirt-guests.sh
|
BUILT_SOURCES += libvirt-guests.sh
|
||||||
|
|
||||||
libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
|
libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e 's!\@libexecdir\@!$(libexecdir)!g' \
|
-e 's|[@]libexecdir[@]|$(libexecdir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
chmod a+x $@-t && \
|
chmod a+x $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
@ -251,16 +251,16 @@ uninstall-systemd:
|
|||||||
endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
|
endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
|
||||||
|
|
||||||
libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status
|
libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status
|
||||||
$(AM_V_GEN)sed \
|
$(AM_V_GEN)sed \
|
||||||
-e 's!\@PACKAGE\@!$(PACKAGE)!g' \
|
-e 's|[@]PACKAGE[@]|$(PACKAGE)|g' \
|
||||||
-e 's!\@bindir\@!$(bindir)!g' \
|
-e 's|[@]bindir[@]|$(bindir)|g' \
|
||||||
-e 's!\@localedir\@!$(localedir)!g' \
|
-e 's|[@]localedir[@]|$(localedir)|g' \
|
||||||
-e 's!\@localstatedir\@!$(localstatedir)!g' \
|
-e 's|[@]localstatedir[@]|$(localstatedir)|g' \
|
||||||
-e 's!\@sbindir\@!$(sbindir)!g' \
|
-e 's|[@]sbindir[@]|$(sbindir)|g' \
|
||||||
-e 's!\@sysconfdir\@!$(sysconfdir)!g' \
|
-e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
|
||||||
-e 's!\@libexecdir\@!$(libexecdir)!g' \
|
-e 's|[@]libexecdir[@]|$(libexecdir)|g' \
|
||||||
< $< > $@-t && \
|
< $< > $@-t && \
|
||||||
chmod a+x $@-t && \
|
chmod a+x $@-t && \
|
||||||
mv $@-t $@
|
mv $@-t $@
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -25,7 +25,7 @@ echo Found "$CERTOOL"
|
|||||||
#
|
#
|
||||||
# Check the directory structure
|
# Check the directory structure
|
||||||
#
|
#
|
||||||
SYSCONFDIR="@SYSCONFDIR@"
|
SYSCONFDIR="@sysconfdir@"
|
||||||
PKI="$SYSCONFDIR/pki"
|
PKI="$SYSCONFDIR/pki"
|
||||||
if [ ! -d "$PKI" ]
|
if [ ! -d "$PKI" ]
|
||||||
then
|
then
|
||||||
|
|||||||
@ -10,9 +10,9 @@ fi
|
|||||||
|
|
||||||
LOCKSPACE="__LIBVIRT__DISKS__"
|
LOCKSPACE="__LIBVIRT__DISKS__"
|
||||||
|
|
||||||
LOCKDIR=`augtool print '/files@SYSCONFDIR@/libvirt/qemu-sanlock.conf/disk_lease_dir'`
|
LOCKDIR=`augtool print '/files@sysconfdir@/libvirt/qemu-sanlock.conf/disk_lease_dir'`
|
||||||
if test $? != 0 || "x$LOCKDIR" = "x" ; then
|
if test $? != 0 || "x$LOCKDIR" = "x" ; then
|
||||||
LOCKDIR="@LOCALSTATEDIR@/lib/libvirt/sanlock"
|
LOCKDIR="@localstatedir@/lib/libvirt/sanlock"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
notify() {
|
notify() {
|
||||||
@ -80,7 +80,7 @@ Alternatively report bugs to your software distributor / vendor.
|
|||||||
|
|
||||||
=head1 COPYRIGHT
|
=head1 COPYRIGHT
|
||||||
|
|
||||||
Copyright (C) 2011 Red Hat, Inc.
|
Copyright (C) 2011, 2013 Red Hat, Inc.
|
||||||
|
|
||||||
=head1 LICENSE
|
=head1 LICENSE
|
||||||
|
|
||||||
|
|||||||
@ -57,7 +57,7 @@ if [ -z "$TYPE" ]; then
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SCHEMA="@SCHEMADIR@/${TYPE}.rng"
|
SCHEMA="@schemadir@/${TYPE}.rng"
|
||||||
|
|
||||||
if [ ! -f "$SCHEMA" ]; then
|
if [ ! -f "$SCHEMA" ]; then
|
||||||
echo "$0: schema $SCHEMA does not exist"
|
echo "$0: schema $SCHEMA does not exist"
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user