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

Re: [libvirt] [PATCH 2/3] build: probes.d and libvirtd.stp should be part of tarball



At 2011-5-13 17:36, Daniel P. Berrange write:
On Fri, May 13, 2011 at 04:02:50PM +0800, Wen Congyang wrote:
Steps to reproduce this problem:
1. # ./autogen.sh --without-libvirtd
2. # make dist
3. # rpmbuild --nodeps --define "_sourcedir `pwd`" -ba libvirt.spec
    ...
    make[2]: Entering directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/daemon'
    make[2]: *** No rule to make target `probes.d', needed by `probes.h'.  Stop.
    make[2]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1/daemon'
    make[1]: *** [all-recursive] Error 1
    make[1]: Leaving directory `/home/wency/rpmbuild/BUILD/libvirt-0.9.1'
    make: *** [all] Error 2
    error: Bad exit status from /var/tmp/rpm-tmp.WkAD7a (%build)

---
  daemon/Makefile.am |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 338663f..92d154f 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -218,8 +218,6 @@ libvirtd_CFLAGS += $(AVAHI_CFLAGS)
  libvirtd_LDADD += $(AVAHI_LIBS)
  endif

-EXTRA_DIST += probes.d libvirtd.stp
-
  if WITH_DTRACE
  libvirtd_LDADD += probes.o
  nodist_libvirtd_SOURCES = probes.h
@@ -349,6 +347,8 @@ uninstall-local:: uninstall-data-sasl
  endif # WITH_LIBVIRTD

  # This is needed for 'make dist' too, so can't wrap in WITH_LIBVIRTD.
+EXTRA_DIST += probes.d libvirtd.stp
+
  POD2MAN = pod2man -c "Virtualization Support" \
  			-r "$(PACKAGE)-$(VERSION)" -s 8

ACK

Thanks, pushed.



Daniel


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