]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
build: fix substitution of RUNSTATEDIR in man pages
authorDaniel P. Berrangé <berrange@redhat.com>
Fri, 18 Oct 2019 14:31:30 +0000 (15:31 +0100)
committerDaniel P. Berrangé <berrange@redhat.com>
Mon, 11 Nov 2019 14:25:47 +0000 (14:25 +0000)
When RUNSTATEDIR was introduced

  commit d29c917ef470a25149d1f3787ec494d006549f27
  Author: Daniel P. Berrangé <berrange@redhat.com>
  Date:   Tue Aug 20 16:05:12 2019 +0100

    src: honour the RUNSTATEDIR variable in all code

The makefile rules for man pages were accidentally not updated for the
new variablle name.

Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
src/Makefile.am
src/locking/Makefile.inc.am
src/logging/Makefile.inc.am
src/remote/Makefile.inc.am

index 4a0c121a7d923cdde66aebac3c7fafd209150256..9b0a46702bf3402ce8301b2eec3e978f48b05aed 100644 (file)
@@ -651,7 +651,7 @@ endif WITH_LIBVIRTD
 %.8: %.8.in $(top_srcdir)/configure.ac
        $(AM_V_GEN)sed \
                -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
-               -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
+               -e 's|[@]runstatedir[@]|$(runstatedir)|g' \
                < $< > $@-t && \
        mv $@-t $@
 
index 5c2361a58104d4839181b15edceeb1e9742a1868..4f178a97ab08838255a4970215577ab1e1ddc401 100644 (file)
@@ -300,7 +300,7 @@ virtlockd.8.in: locking/virtlockd.pod
        if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
        sed \
                -e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-               -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
+               -e 's|RUNSTATEDIR|\@runstatedir\@|g' \
                < $@-t1 > $@-t2 && \
        rm -f $@-t1 && \
        mv $@-t2 $@
index fba54239d5eb742e65842dc32a6d89ee8c1e6ed7..12fc5c23c23bb9550f09fb792af20ea049c72f31 100644 (file)
@@ -136,7 +136,7 @@ virtlogd.8.in: logging/virtlogd.pod
        if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
        sed \
                -e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-               -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
+               -e 's|RUNSTATEDIR|\@runstatedir\@|g' \
                < $@-t1 > $@-t2 && \
        rm -f $@-t1 && \
        mv $@-t2 $@
index f5de92be23c40a1c2490c8dd5626c6a1f25d064c..881c7562a7c0d059d9c0ef72eed91ee78098ca01 100644 (file)
@@ -468,7 +468,7 @@ libvirtd.8.in: remote/libvirtd.pod
        if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
        sed \
                -e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-               -e 's|LOCALSTATEDIR|\@localstatedir\@|g' \
+               -e 's|RUNSTATEDIR|\@runstatedir\@|g' \
                < $@-t1 > $@-t2 && \
        rm -f $@-t1 && \
        mv $@-t2 $@