From 833fa4d7db6aed254053f2e675a69d7b17d0b2b9 Mon Sep 17 00:00:00 2001 From: Francesco Giancane Date: Tue, 27 Jun 2017 23:05:57 +0200 Subject: [PATCH] Make the Makefile variables externally configurable. As of manual page INSTALL.md, it is stated that those variables can be overridden by means of environmental variables. export BINDIR="somedir" export SBINDIR="somedir" export LIBDIR="somedir" export MANDIR="somedir" export INCLUDEDIR="somedir" export LIBEXECDIR="somedir" make install But those settings will not be honored, sticking to default Makefile values. This patch fixes the issue. Signed-off-by: Francesco Giancane Reviewed-by: Dmitry Safonov Signed-off-by: Andrei Vagin --- Makefile.install | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile.install b/Makefile.install index 3606e1e1c7..3987bcc6fb 100644 --- a/Makefile.install +++ b/Makefile.install @@ -1,27 +1,30 @@ # # Installation paths. PREFIX ?= /usr/local -BINDIR := $(PREFIX)/bin -SBINDIR := $(PREFIX)/sbin -MANDIR := $(PREFIX)/share/man -LIBDIR := $(PREFIX)/lib -INCLUDEDIR := $(PREFIX)/include -LIBEXECDIR := $(PREFIX)/libexec +BINDIR ?= $(PREFIX)/bin +SBINDIR ?= $(PREFIX)/sbin +MANDIR ?= $(PREFIX)/share/man +INCLUDEDIR ?= $(PREFIX)/include +LIBEXECDIR ?= $(PREFIX)/libexec 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 ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) else # # For most other systems ifeq "$(shell uname -m)" "x86_64" - LIBDIR := $(PREFIX)/lib64 + LIBDIR ?= $(PREFIX)/lib64 endif endif +# +# LIBDIR falls back to the standard path. +LIBDIR ?= $(PREFIX)/lib + export PREFIX BINDIR SBINDIR MANDIR RUNDIR export LIBDIR INCLUDEDIR LIBEXECDIR