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

Make the Makefile variables externally configurable.

Browse Source 
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 <francescogiancane8@gmail.com>
Reviewed-by: Dmitry Safonov <dsafonov@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Francesco Giancane 2017-06-27 23:05:57 +02:00 committed by Pavel Emelyanov
parent 5f09c258d1
commit 833fa4d7db
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Makefile.install
View File

@ -1,27 +1,30 @@
# #
# Installation paths. # Installation paths.
PREFIX ?= /usr/local PREFIX ?= /usr/local
BINDIR := $(PREFIX)/bin BINDIR ?= $(PREFIX)/bin
SBINDIR := $(PREFIX)/sbin SBINDIR ?= $(PREFIX)/sbin
MANDIR := $(PREFIX)/share/man MANDIR ?= $(PREFIX)/share/man
LIBDIR := $(PREFIX)/lib INCLUDEDIR ?= $(PREFIX)/include
INCLUDEDIR := $(PREFIX)/include LIBEXECDIR ?= $(PREFIX)/libexec
LIBEXECDIR := $(PREFIX)/libexec
RUNDIR ?= /run RUNDIR ?= /run
# #
# For recent Debian/Ubuntu with multiarch support. # For recent Debian/Ubuntu with multiarch support.
DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null) DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH 2>/dev/null)
ifneq "$(DEB_HOST_MULTIARCH)" "" ifneq "$(DEB_HOST_MULTIARCH)" ""
LIBDIR := $(PREFIX)/lib/$(DEB_HOST_MULTIARCH) LIBDIR ?= $(PREFIX)/lib/$(DEB_HOST_MULTIARCH)
else else
# #
# For most other systems # For most other systems
ifeq "$(shell uname -m)" "x86_64" ifeq "$(shell uname -m)" "x86_64"
LIBDIR := $(PREFIX)/lib64 LIBDIR ?= $(PREFIX)/lib64
endif endif
endif endif
#
# LIBDIR falls back to the standard path.
LIBDIR ?= $(PREFIX)/lib
export PREFIX BINDIR SBINDIR MANDIR RUNDIR export PREFIX BINDIR SBINDIR MANDIR RUNDIR
export LIBDIR INCLUDEDIR LIBEXECDIR export LIBDIR INCLUDEDIR LIBEXECDIR