openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

src: Don't use double-colon rules 

According to the GNU Make manual, "double-colon rules are
somewhat obscure and not often very useful". Looking at
the few instances we have in libvirt, that certainly seems
to be the case, so just drop them.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>
This commit is contained in:
Andrea Bolognani 2019-01-11 11:03:53 +01:00
parent 900aae2c77
commit 1b3ea6daaf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile.am
View File

@ -816,14 +816,14 @@ if WITH_LIBVIRTD
if LIBVIRT_INIT_SCRIPT_RED_HAT
initdir = $(sysconfdir)/rc.d/init.d
install-init:: $(SYSVINIT_FILES) install-sysconfig
install-init: $(SYSVINIT_FILES) install-sysconfig
$(MKDIR_P) $(DESTDIR)$(initdir)
for f in $(SYSVINIT_FILES:%.init=%) ; \
do \
$(INSTALL_SCRIPT) $$f.init $(DESTDIR)$(initdir)/$$f; \
done
uninstall-init:: uninstall-sysconfig
uninstall-init: uninstall-sysconfig
rm -f $(SYSVINIT_FILES:%.init=$(DESTDIR)$(initdir)/%)
rmdir $(DESTDIR)$(initdir) || :
@ -1010,7 +1010,7 @@ install-data-local: $(INSTALL_DATA_LOCAL) \
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/filesystems"
$(MKDIR_P) "$(DESTDIR)$(localstatedir)/lib/libvirt/boot"
uninstall-local:: $(UNINSTALL_LOCAL) \
uninstall-local: $(UNINSTALL_LOCAL) \
$(INSTALL_DATA_DIRS:%=uninstall-data-%)
rmdir "$(DESTDIR)$(localstatedir)/cache/libvirt" ||:
rmdir "$(DESTDIR)$(localstatedir)/lib/libvirt/images" ||:

4
src/remote/Makefile.inc.am
View File

@ -213,7 +213,7 @@ polkitdir = $(datadir)/polkit-1
polkitactionsdir = $(polkitdir)/actions
polkitrulesdir = $(polkitdir)/rules.d
install-polkit::
install-polkit:
$(MKDIR_P) $(DESTDIR)$(polkitactionsdir)
$(INSTALL_DATA) $(srcdir)/remote/libvirtd.policy \
$(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
@ -221,7 +221,7 @@ install-polkit::
$(INSTALL_DATA) $(srcdir)/remote/libvirtd.rules \
$(DESTDIR)$(polkitrulesdir)/50-libvirt.rules
uninstall-polkit::
uninstall-polkit:
rm -f $(DESTDIR)$(polkitactionsdir)/org.libvirt.unix.policy
rmdir $(DESTDIR)$(polkitactionsdir) || :
rm -f $(DESTDIR)$(polkitrulesdir)/50-libvirt.rules