Skip to content

Commit

Permalink
Makefile.install: rm unused vars/target
Browse files Browse the repository at this point in the history
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 <[email protected]>
Acked-by: Cyrill Gorcunov <[email protected]>
Signed-off-by: Pavel Emelyanov <[email protected]>
  • Loading branch information
kolyshkin authored and xemul committed Feb 6, 2017
1 parent 5502b5b commit d7f3be8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
1 change: 0 additions & 1 deletion INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ this command accepts the following variables:
* **BINDIR**, to specify where to put CRIT tool (`$(PREFIX)/bin` 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);
* **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).

Thus one can type
Expand Down
13 changes: 2 additions & 11 deletions Makefile.install
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ PREFIX := /usr/local
BINDIR := $(PREFIX)/bin
SBINDIR := $(PREFIX)/sbin
MANDIR := $(PREFIX)/share/man
SYSTEMDUNITDIR := $(PREFIX)/lib/systemd/system
LOGROTATEDIR := $(PREFIX)/etc/logrotate.d
LIBDIR := $(PREFIX)/lib
INCLUDEDIR := $(PREFIX)/include
LIBEXECDIR := $(PREFIX)/libexec
Expand All @@ -23,15 +21,8 @@ else
endif
endif

export BINDIR SBINDIR MANDIR SYSTEMDUNITDIR LOGROTATEDIR
export INCLUDEDIR LIBDIR DESTDIR PREFIX 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
export PREFIX BINDIR SBINDIR MANDIR
export LIBDIR INCLUDEDIR LIBEXECDIR

install-man:
$(Q) $(MAKE) -C Documentation install
Expand Down

0 comments on commit d7f3be8

Please sign in to comment.