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

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 23f1e50dbad76e5743f692599fa91aa1d44bd36f..8e9383307a497dc0db6576ab04578bef51596316 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -1,6 +1,6 @@
 ## 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
 
 INCLUDES = \
@@ -85,8 +85,8 @@ CLEANFILES += test_libvirtd.aug
 
 libvirtd.8: $(srcdir)/libvirtd.8.in
        $(AM_V_GEN)sed \
-           -e 's!SYSCONFDIR!$(sysconfdir)!g' \
-           -e 's!LOCALSTATEDIR!$(localstatedir)!g' \
+           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
            < $< > $@-t && \
        mv $@-t $@
 
@@ -216,25 +216,25 @@ BUILT_SOURCES += $(LOGROTATE_CONFS)
 
 libvirtd.logrotate: libvirtd.logrotate.in
        $(AM_V_GEN)sed                                          \
-           -e 's![@]localstatedir[@]!$(localstatedir)!g'       \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
            < $< > $@-t && \
        mv $@-t $@
 
 libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in
        $(AM_V_GEN)sed                                          \
-           -e 's![@]localstatedir[@]!$(localstatedir)!g'       \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
            < $< > $@-t && \
        mv $@-t $@
 
 libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in
        $(AM_V_GEN)sed                                          \
-           -e 's![@]localstatedir[@]!$(localstatedir)!g'       \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
            < $< > $@-t &&                                      \
            mv $@-t $@
 
 libvirtd.uml.logrotate: libvirtd.uml.logrotate.in
        $(AM_V_GEN)sed                                          \
-           -e 's![@]localstatedir[@]!$(localstatedir)!g'       \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
            < $< > $@-t &&                                      \
            mv $@-t $@
 
@@ -334,21 +334,21 @@ uninstall-init-systemd:
 endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
 
 libvirtd.init: libvirtd.init.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed                                  \
-           -e s!\@localstatedir\@!$(localstatedir)!g   \
-           -e s!\@sbindir\@!$(sbindir)!g               \
-           -e s!\@sysconfdir\@!$(sysconfdir)!g         \
-           < $< > $@-t &&                              \
-           chmod a+x $@-t &&                           \
+       $(AM_V_GEN)sed                                          \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
+           -e 's|[@]sbindir[@]|$(sbindir)|g'                   \
+           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'             \
+           < $< > $@-t &&                                      \
+           chmod a+x $@-t &&                                   \
            mv $@-t $@
 
 libvirtd.service: libvirtd.service.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed                                  \
-           -e s!\@localstatedir\@!$(localstatedir)!g   \
-           -e s!\@sbindir\@!$(sbindir)!g               \
-           -e s!\@sysconfdir\@!$(sysconfdir)!g         \
-           < $< > $@-t &&                              \
-           chmod a+x $@-t &&                           \
+       $(AM_V_GEN)sed                                          \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
+           -e 's|[@]sbindir[@]|$(sbindir)|g'                   \
+           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'             \
+           < $< > $@-t &&                                      \
+           chmod a+x $@-t &&                                   \
            mv $@-t $@
 
 

diff --git a/src/Makefile.am b/src/Makefile.am
index f82c710be754e94c8c11d7079666580741ebec80..5a10339d6b4dc36e35ce145308d1aa257a82ebe0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 ## 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
 
 # No libraries with the exception of LIBXML should be listed

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 605bf3b1f2238e496123f08253f1d238b14dadf1..58dbfe7b054d4e6059af9651cfff65d9803255ca 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -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
 
 INCLUDES = \
@@ -58,7 +58,7 @@ dist_man8_MANS = virt-sanlock-cleanup.8
 endif
 
 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 $@
 
 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
 
 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 $@
 
 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
 
 virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile
-       $(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' \
-           -e 's,[@]LOCALSTATEDIR@,$(localstatedir),' < $< > $@ \
+       $(AM_V_GEN)sed -e 's|[@]sysconfdir@|$(sysconfdir)|' \
+           -e 's|[@]localstatedir@|$(localstatedir)|' < $< > $@ \
            || (rm $@ && exit 1) && chmod +x $@
 
 virt-sanlock-cleanup.8: virt-sanlock-cleanup.in
@@ -210,21 +210,21 @@ uninstall-init:
 endif # LIBVIRT_INIT_SCRIPT_RED_HAT
 
 libvirt-guests.sh: libvirt-guests.sh.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed                                  \
-           -e 's!\@PACKAGE\@!$(PACKAGE)!g'             \
-           -e 's!\@bindir\@!$(bindir)!g'               \
-           -e 's!\@localedir\@!$(localedir)!g'         \
-           -e 's!\@localstatedir\@!$(localstatedir)!g' \
-           -e 's!\@sbindir\@!$(sbindir)!g'             \
-           -e 's!\@sysconfdir\@!$(sysconfdir)!g'       \
-           < $< > $@-t &&                              \
-           chmod a+x $@-t &&                           \
+       $(AM_V_GEN)sed                                          \
+           -e 's|[@]PACKAGE[@]|$(PACKAGE)|g'                   \
+           -e 's|[@]bindir[@]|$(bindir)|g'                     \
+           -e 's|[@]localedir[@]|$(localedir)|g'               \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
+           -e 's|[@]sbindir[@]|$(sbindir)|g'                   \
+           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'             \
+           < $< > $@-t &&                                      \
+           chmod a+x $@-t &&                                   \
            mv $@-t $@
 BUILT_SOURCES += libvirt-guests.sh
 
 libvirt-guests.init: libvirt-guests.init.in libvirt-guests.sh
        $(AM_V_GEN)sed \
-               -e 's!\@libexecdir\@!$(libexecdir)!g' \
+               -e 's|[@]libexecdir[@]|$(libexecdir)|g' \
        < $< > $@-t && \
        chmod a+x $@-t && \
        mv $@-t $@
@@ -251,16 +251,16 @@ uninstall-systemd:
 endif # LIBVIRT_INIT_SCRIPT_SYSTEMD
 
 libvirt-guests.service: libvirt-guests.service.in $(top_builddir)/config.status
-       $(AM_V_GEN)sed                                  \
-           -e 's!\@PACKAGE\@!$(PACKAGE)!g'             \
-           -e 's!\@bindir\@!$(bindir)!g'               \
-           -e 's!\@localedir\@!$(localedir)!g'         \
-           -e 's!\@localstatedir\@!$(localstatedir)!g' \
-           -e 's!\@sbindir\@!$(sbindir)!g'             \
-           -e 's!\@sysconfdir\@!$(sysconfdir)!g'       \
-           -e 's!\@libexecdir\@!$(libexecdir)!g'       \
-           < $< > $@-t &&                              \
-           chmod a+x $@-t &&                           \
+       $(AM_V_GEN)sed                                          \
+           -e 's|[@]PACKAGE[@]|$(PACKAGE)|g'                   \
+           -e 's|[@]bindir[@]|$(bindir)|g'                     \
+           -e 's|[@]localedir[@]|$(localedir)|g'               \
+           -e 's|[@]localstatedir[@]|$(localstatedir)|g'       \
+           -e 's|[@]sbindir[@]|$(sbindir)|g'                   \
+           -e 's|[@]sysconfdir[@]|$(sysconfdir)|g'             \
+           -e 's|[@]libexecdir[@]|$(libexecdir)|g'             \
+           < $< > $@-t &&                                      \
+           chmod a+x $@-t &&                                   \
            mv $@-t $@
 
 

diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in
index 866a235427ea284c463a2bb22b19e4653f88809b..2edbf85f82fab217de125307b9ecb5abce43dbd5 100755 (executable)
--- a/tools/virt-pki-validate.in
+++ b/tools/virt-pki-validate.in
@@ -25,7 +25,7 @@ echo Found "$CERTOOL"
 #
 # Check the directory structure
 #
-SYSCONFDIR="@SYSCONFDIR@"
+SYSCONFDIR="@sysconfdir@"
 PKI="$SYSCONFDIR/pki"
 if [ ! -d "$PKI" ]
 then

diff --git a/tools/virt-sanlock-cleanup.in b/tools/virt-sanlock-cleanup.in
index e143e7d8af4eadca60865b0d5dcf4c19dd85c91b..a9b7c2ef84c3aabf76b8a62bc445ffbddf5b032a 100644 (file)
--- a/tools/virt-sanlock-cleanup.in
+++ b/tools/virt-sanlock-cleanup.in
@@ -10,9 +10,9 @@ fi
 
 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
-  LOCKDIR="@LOCALSTATEDIR@/lib/libvirt/sanlock"
+  LOCKDIR="@localstatedir@/lib/libvirt/sanlock"
 fi
 
 notify() {
@@ -80,7 +80,7 @@ Alternatively report bugs to your software distributor / vendor.
 
 =head1 COPYRIGHT
 
-Copyright (C) 2011 Red Hat, Inc.
+Copyright (C) 2011, 2013 Red Hat, Inc.
 
 =head1 LICENSE
 

diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in
index 27ad59e98f1d58b54251ccc36b496b9c3f9a75ce..9c584edf0bfe08c75f3732f08b6538bfc0517bd2 100644 (file)
--- a/tools/virt-xml-validate.in
+++ b/tools/virt-xml-validate.in
@@ -57,7 +57,7 @@ if [ -z "$TYPE" ]; then
   esac
 fi
 
-SCHEMA="@SCHEMADIR@/${TYPE}.rng"
+SCHEMA="@schemadir@/${TYPE}.rng"
 
 if [ ! -f "$SCHEMA" ]; then
   echo "$0: schema $SCHEMA does not exist"