[CRIU] [PATCH] compel: fix uninstall
Kir Kolyshkin
kir at openvz.org
Fri Feb 24 11:06:22 PST 2017
A slash after a directory was missing in a number of places, that
resulted in "make uninstall" leaving a number of files behind.
Signed-off-by: Kir Kolyshkin <kir at openvz.org>
---
compel/Makefile | 14 +++++++-------
compel/plugins/Makefile | 4 ++--
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/compel/Makefile b/compel/Makefile
index 159a3e1..a09b4cc 100644
--- a/compel/Makefile
+++ b/compel/Makefile
@@ -77,11 +77,11 @@ uninstall:
$(E) " UNINSTALL" $(LIBCOMPEL_A)
$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBDIR)/,$(LIBCOMPEL_A))
$(E) " UNINSTALL" compel uapi
- $(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/*.h)
- $(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/asm/*.h)
- $(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/asm/)
- $(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/common/*.h)
- $(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/common/asm/*.h)
- $(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/common/asm/)
- $(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/common/)
+ $(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/*.h)
+ $(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/asm/*.h)
+ $(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/asm/)
+ $(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/common/*.h)
+ $(Q) $(RM) $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/common/asm/*.h)
+ $(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/common/asm/)
+ $(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/common/)
.PHONY: uninstall
diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
index ac23a11..b2a4e05 100644
--- a/compel/plugins/Makefile
+++ b/compel/plugins/Makefile
@@ -92,7 +92,7 @@ install: compel/plugins/std.built-in.o
uninstall:
$(E) " UNINSTALL" compel plugins
$(Q) $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/compel/,std.built-in.o)
- $(Q) $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/compel/scripts,compel-pack.lds.S)
+ $(Q) $(RM) $(addprefix $(DESTDIR)$(LIBEXECDIR)/compel/scripts/,compel-pack.lds.S)
$(E) " UNINSTALL" compel and plugins uapi
- $(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR),compel/plugins)
+ $(Q) $(RM) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/plugins)
.PHONY: uninstall
--
2.9.3
More information about the CRIU
mailing list