[libvirt] [PATCH] avoid another "make distcheck" failure

Jim Meyering jim at meyering.net
Sat Jan 9 09:01:22 UTC 2010

"make uninstall" would fail

  rm: cannot remove `/home/j/w/co/libvirt/libvirt-0.7.5/_inst/share/gtk-doc/html\
  /libvirtdevhelp/libvirt.devhelp': No such file or directory
  rm: cannot remove `/home/j/w/co/libvirt/libvirt-0.7.5/_inst/share/gtk-doc/html\
  /libvirtdevhelp/index.html': No such file or directory

There are two problems: first, "libvirtdevhelp" is not a valid dir name.
Inserting a slash fixes that.
Second, that "devhelp/" does not belong at all.
It comes from each value of $$f.  Using basename fixes that:

With this, "make distcheck" passes once again.

>From 0418fa2e7265d6cf938f2172a0aeb9f9d7a93022 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Sat, 9 Jan 2010 09:56:20 +0100
Subject: [PATCH] avoid another "make distcheck" failure

* docs/Makefile.am (uninstall-local): Separate $$f from preceding
dir name with a "/" and use $$(basename $$f) rather than $$f, since
some values of $$f are prefixed with devhelp/.
 docs/Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/docs/Makefile.am b/docs/Makefile.am
index d53f305..c19e963 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -159,4 +159,5 @@ uninstall-local:
 	for h in $(apihtml); do rm $(DESTDIR)$(HTML_DIR)/$$h; done
 	for p in $(apipng); do rm $(DESTDIR)$(HTML_DIR)/$$p; done
 	for f in $(devhelphtml) $(devhelppng) $(devhelpcss); do \
-		rm $(DESTDIR)$(DEVHELP_DIR)$$f ; done
+	  rm $(DESTDIR)$(DEVHELP_DIR)/$$(basename $$f); \
+	done

More information about the libvir-list mailing list