[PATCH 03/13] build: Build man pages in $(builddir)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



No file should be created inside $(srcdir) during build.
---
 daemon/Makefile.am |  6 +++---
 src/Makefile.am    | 10 +++++-----
 tools/Makefile.am  | 10 ++++------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 78d7d21..13ae1c2 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -162,7 +162,7 @@ augeastests_DATA = test_libvirtd.aug
 
 CLEANFILES += test_libvirtd.aug
 
-libvirtd.8: $(srcdir)/libvirtd.8.in
+libvirtd.8: libvirtd.8.in
 	$(AM_V_GEN)sed \
 	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
@@ -517,7 +517,7 @@ endif ! WITH_LIBVIRTD
 POD2MAN = pod2man -c "Virtualization Support" \
 			-r "$(PACKAGE)-$(VERSION)" -s 8
 
-$(srcdir)/libvirtd.8.in: libvirtd.pod.in $(top_srcdir)/configure.ac
+libvirtd.8.in: libvirtd.pod.in $(top_srcdir)/configure.ac
 	$(AM_V_GEN)$(POD2MAN) --name LIBVIRTD $< $@ \
 	    && if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi
 
@@ -540,4 +540,4 @@ endif ! WITH_SASL
 
 CLEANFILES += $(BUILT_SOURCES) $(man8_MANS)
 CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda
-MAINTAINERCLEANFILES = $(srcdir)/libvirtd.8.in $(DAEMON_GENERATED)
+MAINTAINERCLEANFILES = libvirtd.8.in $(DAEMON_GENERATED)
diff --git a/src/Makefile.am b/src/Makefile.am
index f5e57c0..c2ec53f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2563,22 +2563,22 @@ virtlogd.init: logging/virtlogd.init.in $(top_builddir)/config.status
 POD2MAN = pod2man -c "Virtualization Support" \
 			-r "$(PACKAGE)-$(VERSION)" -s 8
 
-$(srcdir)/virtlockd.8.in: locking/virtlockd.pod.in $(top_srcdir)/configure.ac
+virtlockd.8.in: locking/virtlockd.pod.in $(top_srcdir)/configure.ac
 	$(AM_V_GEN)$(POD2MAN) --name VIRTLOCKD $< $@ \
 	    && if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi
 
-virtlockd.8: $(srcdir)/virtlockd.8.in
+virtlockd.8: virtlockd.8.in
 	$(AM_V_GEN)sed \
 	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
 	    < $< > $@-t && \
 	mv $@-t $@
 
-$(srcdir)/virtlogd.8.in: logging/virtlogd.pod.in $(top_srcdir)/configure.ac
+virtlogd.8.in: logging/virtlogd.pod.in $(top_srcdir)/configure.ac
 	$(AM_V_GEN)$(POD2MAN) --name VIRTLOGD $< $@ \
 	    && if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi
 
-virtlogd.8: $(srcdir)/virtlogd.8.in
+virtlogd.8: virtlogd.8.in
 	$(AM_V_GEN)sed \
 	    -e 's|[@]sysconfdir[@]|$(sysconfdir)|g' \
 	    -e 's|[@]localstatedir[@]|$(localstatedir)|g' \
@@ -2596,7 +2596,7 @@ endif WITH_LIBVIRTD
 
 CLEANFILES += test_virtlockd.aug virtlockd.8 \
 	      test_virtlogd.aug virtlogd.8
-MAINTAINERCLEANFILES += $(srcdir)/virtlockd.8.in $(srcdir)/virtlogd.8.in
+MAINTAINERCLEANFILES += virtlockd.8.in virtlogd.8.in
 
 EXTRA_DIST += \
         locking/virtlockd.service.in \
diff --git a/tools/Makefile.am b/tools/Makefile.am
index dd058fa..298b01b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -267,14 +267,12 @@ virsh_win_icon.$(OBJEXT): virsh_win_icon.rc
 endif WITH_WIN_ICON
 
 %.1: %.pod $(top_srcdir)/configure.ac
-	$(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ \
-		&& if grep 'POD ERROR' $(srcdir)/$@ ; then \
-		rm $(srcdir)/$@; exit 1; fi
+	$(AM_V_GEN)$(POD2MAN) $< $@ \
+		&& if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi
 
 %.8: %.pod $(top_srcdir)/configure.ac
-	$(AM_V_GEN)$(POD2MAN) --section=8 $< $(srcdir)/$@ \
-		&& if grep 'POD ERROR' $(srcdir)/$@ ; then \
-		rm $(srcdir)/$@; exit 1; fi
+	$(AM_V_GEN)$(POD2MAN) --section=8 $< $@ \
+		&& if grep 'POD ERROR' $@ ; then rm $@; exit 1; fi
 
 install-data-local: install-init install-systemd
 
-- 
2.5.5

--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list



[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]