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

Re: [libvirt] [PATCH] install: fix virtlockd installation



On 12/14/2012 05:33 AM, Jiri Denemark wrote:

>>>   CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
>>> +CLEANFILES += $(BUILT_SOURCES)
> 
> I think this is dangerous. IIRC, BUILT_SOURCES includes files we
> distribute in the tarball, such as those generated from *.x

It copied from daemon/Makefile.am, but that directory didn't have .x
files.  v2 coming up, with this difference:

diff --git i/src/Makefile.am w/src/Makefile.am
index ae6384b..53ec9da 100644
--- i/src/Makefile.am
+++ w/src/Makefile.am
 -1651,6 +1651,7 @@ uninstall-init:: uninstall-sysconfig
 	rmdir $(DESTDIR)$(sysconfdir)/rc.d/init.d || :

 BUILT_SOURCES += virtlockd.init
+DISTCLEANFILES += virtlockd.init
 else
 install-init::
 uninstall-init::
 -1679,6 +1680,7 @@ if LIBVIRT_INIT_SCRIPT_SYSTEMD
 SYSTEMD_UNIT_DIR = /lib/systemd/system

 BUILT_SOURCES += virtlockd.service virtlockd.socket
+DISTCLEANFILES += virtlockd.service virtlockd.socket

 install-systemd: virtlockd.service virtlockd.socket install-sysconfig
 	$(MKDIR_P) $(DESTDIR)$(SYSTEMD_UNIT_DIR)
 -2054,6 +2056,5 @@ endif
 	rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt" ||:

 CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s
-CLEANFILES += $(BUILT_SOURCES)
 DISTCLEANFILES += $(GENERATED_SYM_FILES)
 MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED)

-- 
Eric Blake   eblake redhat com    +1-919-301-3266
Libvirt virtualization library http://libvirt.org

Attachment: signature.asc
Description: OpenPGP digital signature


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