Generate some config files at build time, not install time.

Generating at install time breaks 'make && sudo make install' if root
can't access the users home directory (NFS w/o no_root_squash for example).

diff --git a/ChangeLog b/ChangeLog
index 5841278d56c6633c209a13dc5674337780b3f7b5..a3e796dacfe56021314eb3f7cc26d690a719a76f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue May 19 09:20:54 EDT 2009 Cole Robinson <crobinso@redhat.com>
+
+       * qemud/Makefile.am: Generate some config files at build time.
+
 Tue May 19 09:16:37 EDT 2009 Cole Robinson <crobinso@redhat.com>
 
        Add documentation for <sound> device XML format.

diff --git a/qemud/Makefile.am b/qemud/Makefile.am
index 924e8ad9d4748c2a5f13b0e23003d64635a31ff3..9b8e6bac9340b1462105f4c14152511dbd616033 100644 (file)
--- a/qemud/Makefile.am
+++ b/qemud/Makefile.am
@@ -31,6 +31,8 @@ EXTRA_DIST =                                          \
        $(AVAHI_SOURCES)                                \
        $(DAEMON_SOURCES)
 
+BUILT_SOURCES = libvirtd.init libvirtd.logrotate
+
 if HAVE_RPCGEN
 #
 # Maintainer-only target for re-generating the derived .c/.h source
@@ -212,7 +214,6 @@ remote_dispatch_args.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x
 remote_dispatch_ret.h: $(srcdir)/remote_generate_stubs.pl remote_protocol.x
        perl -w $(srcdir)/remote_generate_stubs.pl -r $(srcdir)/remote_protocol.x > $@
 
-DISTCLEANFILES += libvirtd.logrotate
 libvirtd.logrotate: libvirtd.logrotate.in
        sed                                             \
            -e s!\@localstatedir\@!@localstatedir@!g    \
@@ -256,6 +257,7 @@ else
 
 install-init:
 uninstall-init:
+libvirtd.init:
 
 endif # DBUS_INIT_SCRIPTS_RED_HAT
 
@@ -265,5 +267,5 @@ libvirtd_LDADD += ../gnulib/lib/libgnu.la $(LIBSOCKET)
 
 endif # WITH_LIBVIRTD
 
-CLEANFILES = libvirtd.init
+CLEANFILES = $(BUILT_SOURCES)
 CLEANFILES += *.cov *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda