mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 18:07:57 +00:00
Code Issues Releases Wiki Activity

Makefile.install: rm unused vars/target

Browse Source 
1. LOGROTATEDIR is not used since commit f4e9a1d
("make: don't install service and logrotate configs").

2. SYSTEMDUNITDIR is not used since commit 10d5e9a
("criu: scripts: remove criu service files").

3. install-tree target was *never* used, makes no sense
to keep it.

While at it, also
 - sort the variables in "export" statement to match
   the order of appearance in Makefile;

 - don't export DESTDIR (it is exported by default as
   it always comes from the make command line);

 - remove unused variable from INSTALL.md.

travis-ci: success for Makefile.install fixes
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Acked-by: Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Kir Kolyshkin 2017-01-06 15:36:06 -08:00 committed by Pavel Emelyanov
parent 5502b5b568
commit d7f3be8a8e
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
INSTALL.md
View File

@ -13,7 +13,6 @@ this command accepts the following variables:
* **BINDIR**, to specify where to put CRIT tool (`$(PREFIX)/bin` by default); * **BINDIR**, to specify where to put CRIT tool (`$(PREFIX)/bin` by default);
* **SBINDIR**, to specify where to put CRIU executable (`$(PREFIX)/sbin` by default); * **SBINDIR**, to specify where to put CRIU executable (`$(PREFIX)/sbin` by default);
* **MANDIR**, to specify directory for manual pages (`$(PREFIX)/share/man` by default); * **MANDIR**, to specify directory for manual pages (`$(PREFIX)/share/man` by default);
* **SYSTEMDUNITDIR**, to specify place where systemd units are living (`$(PREFIX)/lib/systemd/system` by default);
* **LIBDIR**, to specify directory where to put libraries (guess the correct path by default). * **LIBDIR**, to specify directory where to put libraries (guess the correct path by default).
Thus one can type Thus one can type

13
Makefile.install
View File

@ -4,8 +4,6 @@ PREFIX := /usr/local
BINDIR := $(PREFIX)/bin BINDIR := $(PREFIX)/bin
SBINDIR := $(PREFIX)/sbin SBINDIR := $(PREFIX)/sbin
MANDIR := $(PREFIX)/share/man MANDIR := $(PREFIX)/share/man
SYSTEMDUNITDIR := $(PREFIX)/lib/systemd/system
LOGROTATEDIR := $(PREFIX)/etc/logrotate.d
LIBDIR := $(PREFIX)/lib LIBDIR := $(PREFIX)/lib
INCLUDEDIR := $(PREFIX)/include INCLUDEDIR := $(PREFIX)/include
LIBEXECDIR := $(PREFIX)/libexec LIBEXECDIR := $(PREFIX)/libexec
@ -23,15 +21,8 @@ else
endif endif
endif endif
export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR export PREFIX BINDIR SBINDIR MANDIR
export INCLUDEDIR LIBDIR DESTDIR PREFIX LIBEXECDIR export LIBDIR INCLUDEDIR LIBEXECDIR
install-tree:
$(Q) mkdir -p $(DESTDIR)$(SYSTEMDUNITDIR)
$(Q) mkdir -p $(DESTDIR)$(LOGROTATEDIR)
$(Q) mkdir -p $(DESTDIR)$(INCLUDEDIR)
$(Q) mkdir -p $(DESTDIR)$(LIBEXECDIR)
.PHONY: install-tree
install-man: install-man:
$(Q) $(MAKE) -C Documentation install $(Q) $(MAKE) -C Documentation install