From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 18 Oct 2019 14:31:30 +0000 (+0100)
Subject: build: fix substitution of RUNSTATEDIR in man pages
X-Git-Tag: v5.10.0-rc1~350
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d64f31dc1f78ff499e4e133ebf2299c240b5ae78;p=thirdparty%2Flibvirt.git

build: fix substitution of RUNSTATEDIR in man pages

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>
---

diff --git a/src/Makefile.am b/src/Makefile.am
index 4a0c121a7d..9b0a46702b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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 $@
 
diff --git a/src/locking/Makefile.inc.am b/src/locking/Makefile.inc.am
index 5c2361a581..4f178a97ab 100644
--- a/src/locking/Makefile.inc.am
+++ b/src/locking/Makefile.inc.am
@@ -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 $@
diff --git a/src/logging/Makefile.inc.am b/src/logging/Makefile.inc.am
index fba54239d5..12fc5c23c2 100644
--- a/src/logging/Makefile.inc.am
+++ b/src/logging/Makefile.inc.am
@@ -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 $@
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index f5de92be23..881c7562a7 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -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 $@