openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: fix substitution of RUNSTATEDIR in man pages 

When RUNSTATEDIR was introduced

  commit d29c917ef4
  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>
This commit is contained in:
Daniel P. Berrangé 2019-10-18 15:31:30 +01:00
parent 07943d35ea
commit d64f31dc1f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -651,7 +651,7 @@ endif WITH_LIBVIRTD
%.8: %.8.in $(top_srcdir)/configure.ac %.8: %.8.in $(top_srcdir)/configure.ac
$(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|[@]runstatedir[@]|$(runstatedir)|g' \
< $< > $@-t && \ < $< > $@-t && \
mv $@-t $@ mv $@-t $@

2
src/locking/Makefile.inc.am
View File

@ -300,7 +300,7 @@ virtlockd.8.in: locking/virtlockd.pod
if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
sed \ sed \
-e 's|SYSCONFDIR|\@sysconfdir\@|g' \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ -e 's|RUNSTATEDIR|\@runstatedir\@|g' \
< $@-t1 > $@-t2 && \ < $@-t1 > $@-t2 && \
rm -f $@-t1 && \ rm -f $@-t1 && \
mv $@-t2 $@ mv $@-t2 $@

2
src/logging/Makefile.inc.am
View File

@ -136,7 +136,7 @@ virtlogd.8.in: logging/virtlogd.pod
if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
sed \ sed \
-e 's|SYSCONFDIR|\@sysconfdir\@|g' \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ -e 's|RUNSTATEDIR|\@runstatedir\@|g' \
< $@-t1 > $@-t2 && \ < $@-t1 > $@-t2 && \
rm -f $@-t1 && \ rm -f $@-t1 && \
mv $@-t2 $@ mv $@-t2 $@

2
src/remote/Makefile.inc.am
View File

@ -468,7 +468,7 @@ libvirtd.8.in: remote/libvirtd.pod
if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \ if grep 'POD ERROR' $@-t1; then rm $@-t1; exit 1; fi && \
sed \ sed \
-e 's|SYSCONFDIR|\@sysconfdir\@|g' \ -e 's|SYSCONFDIR|\@sysconfdir\@|g' \
-e 's|LOCALSTATEDIR|\@localstatedir\@|g' \ -e 's|RUNSTATEDIR|\@runstatedir\@|g' \
< $@-t1 > $@-t2 && \ < $@-t1 > $@-t2 && \
rm -f $@-t1 && \ rm -f $@-t1 && \
mv $@-t2 $@ mv $@-t2 $@