From: Wen Congyang Date: Wed, 9 Mar 2011 03:18:36 +0000 (+0800) Subject: build: fix building error when building without libvirtd X-Git-Tag: CVE-2011-1146~48 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e07a401136a0cf9159ae66b60c58811c044d0d5;p=thirdparty%2Flibvirt.git build: fix building error when building without libvirtd When building libvirt without libvirtd, I receive the following errors: make[1]: Leaving directory `/home/wency/source/test/libvirt/src' (cd daemon && make top_distdir=../libvirt-0.8.8 distdir=../libvirt-0.8.8/daemon \ am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir) make[1]: Entering directory `/home/wency/source/test/libvirt/daemon' make[1]: *** No rule to make target `libvirtd.8.in', needed by `distdir'. Stop. This bug was caused by commit 6db98a2d. Signed-off-by: Wen Congyang Signed-off-by: Eric Blake --- diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 912440cf52..15e8129bf5 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -60,9 +60,6 @@ augeas_DATA = libvirtd.aug augeastestsdir = $(datadir)/augeas/lenses/tests augeastests_DATA = test_libvirtd.aug -POD2MAN = pod2man -c "Virtualization Support" \ - -r "$(PACKAGE)-$(VERSION)" -s 8 - libvirtd.8: $(srcdir)/libvirtd.8.in sed \ -e 's![@]sysconfdir[@]!$(sysconfdir)!g' \ @@ -71,9 +68,6 @@ libvirtd.8: $(srcdir)/libvirtd.8.in < $< > $@-t mv $@-t $@ -$(srcdir)/libvirtd.8.in: libvirtd.pod.in - $(AM_V_GEN)$(POD2MAN) $< $@ - libvirtd_SOURCES = $(DAEMON_SOURCES) #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L @@ -330,6 +324,13 @@ install-data-local: install-data-sasl uninstall-local:: uninstall-data-sasl endif # WITH_LIBVIRTD +# This is needed for 'make dist' too, so can't wrap in WITH_LIBVIRTD. +POD2MAN = pod2man -c "Virtualization Support" \ + -r "$(PACKAGE)-$(VERSION)" -s 8 + +$(srcdir)/libvirtd.8.in: libvirtd.pod.in + $(AM_V_GEN)$(POD2MAN) $< $@ + # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional if HAVE_SASL