diff options
| author | Kir Kolyshkin <kir@openvz.org> | 2017-03-05 08:42:48 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@virtuozzo.com> | 2017-03-15 09:36:08 +0300 |
| commit | ef849f2df851a76eb34421fadd4b8229ec025c75 (patch) | |
| tree | 134a09e220fa53d5cc6fdb29b4b5a774617c4f88 /compel/Makefile | |
| parent | 31eab3e36dfcdd3255aaf6254254a75766719784 (diff) | |
compel Makefiles: simplify headers [un]install
* install
'cp' can copy recursively, create directories, and even
dereference symlinks. Everything we have in uapi/ is to be installed.
NOTE we can't use -r for compel includes, as there is some extra stuff
in there we don't want to take with us (in particular, plugins/
and 'compel -> .' symlinks).
* uninstall
rm -rf everything under compel includedir
While at it, fix some minor things here and there.
Reviewed-by: Cyrill Gorcunov <gorcunov@openvz.org>
Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Acked-by: Pavel Emelyanov <xemul@virtuozzo.com>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Diffstat (limited to 'compel/Makefile')
| -rw-r--r-- | compel/Makefile | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/compel/Makefile b/compel/Makefile index d09aa7739..fee12121b 100644 --- a/compel/Makefile +++ b/compel/Makefile @@ -59,10 +59,9 @@ install: compel/compel compel/$(LIBCOMPEL_SO) compel/$(LIBCOMPEL_A) $(E) " INSTALL " $(LIBCOMPEL_A) $(Q) install -m 0644 compel/$(LIBCOMPEL_A) $(DESTDIR)$(LIBDIR) $(E) " INSTALL " compel uapi - $(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)/compel/ $(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)/compel/asm - $(Q) cp -fr compel/include/uapi/compel/*.h $(DESTDIR)$(INCLUDEDIR)/compel - $(Q) cp -fr compel/include/uapi/compel/asm/*.h $(DESTDIR)$(INCLUDEDIR)/compel/asm + $(Q) cp -fr compel/include/uapi/*.h $(DESTDIR)$(INCLUDEDIR)/compel/ + $(Q) cp -fr compel/include/uapi/asm/*.h $(DESTDIR)$(INCLUDEDIR)/compel/asm/ $(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)/compel/common/asm $(Q) cp -fr include/common/compiler.h $(DESTDIR)$(INCLUDEDIR)/compel/common/ .PHONY: install @@ -77,11 +76,5 @@ 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) -rf $(addprefix $(DESTDIR)$(INCLUDEDIR)/,compel/*) .PHONY: uninstall |