[CRIU] Subject: [PATCH 2/2] Makefile variables BINDIR, SBINDIR, MANDIR, LIBDIR shall also be externally configurable.

[Francesco Giancane]

>From 551e9d2f88258f42c4f2594d7c6805c486b02f99 Mon Sep 17 00:00:00 2001
From: Francesco Giancane <francescogiancane8 at gmail.com>
Date: Mon, 26 Jun 2017 00:50:44 +0200
Subject: [PATCH 2/2] Makefile variables BINDIR, SBINDIR, MANDIR, LIBDIR shall
 also be externally configurable.

 As stated in the official INSTALL.md document, BINDIR, SBINDIR, MANDIR, LIBDIR
 variables shall be configurable using environment variables.

i.e.
export BINDIR='...'
export SBINDIR='...'
export MANDIR='...'
export LIBDIR='...'

make install

 Before this patch, they were set at fixed values. Now it is possible to change
 them at ease.

 I preserved the possibility to add the '64' suffix or the DEB_HOST_MULTIARCH
 variable as before, so that the LIBDIR is correctly computed.

Signed-off-by: Francesco Giancane <francescogiancane8 at gmail.com>
---
 Makefile.install | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile.install b/Makefile.install
index 3606e1e..bd8bbd8 100644
--- a/Makefile.install
+++ b/Makefile.install
@@ -1,10 +1,10 @@
 #
 # Installation paths.
 PREFIX ?= /usr/local
-BINDIR := $(PREFIX)/bin
-SBINDIR := $(PREFIX)/sbin
-MANDIR := $(PREFIX)/share/man
-LIBDIR := $(PREFIX)/lib
+BINDIR ?= $(PREFIX)/bin
+SBINDIR ?= $(PREFIX)/sbin
+MANDIR ?= $(PREFIX)/share/man
+LIBDIR ?= $(PREFIX)/lib
 INCLUDEDIR := $(PREFIX)/include
 LIBEXECDIR := $(PREFIX)/libexec
 RUNDIR ?= /run
@@ -13,12 +13,12 @@ RUNDIR ?= /run
 # For recent Debian/Ubuntu with multiarch support.
 DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH
2>/dev/null)
 ifneq "$(DEB_HOST_MULTIARCH)" ""
-        LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
+LIBDIR := $(LIBDIR)/$(DEB_HOST_MULTIARCH)
 else
         #
         # For most other systems
         ifeq "$(shell uname -m)" "x86_64"
-                LIBDIR := $(PREFIX)/lib64
+ LIBDIR := $(LIBDIR)64
         endif
 endif

-- 
2.9.4

Francesco Giancane