From c13f72ee0a6600963a10e57155d2e814d56599e2 Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Sat, 8 Oct 2016 02:23:51 +0200 Subject: [PATCH] Makefile: add PREFIX variable We use a Makefile which in turn uses cmake. If we wanted to set the install prefix for cmake, we had to do this so far: make CMAKE_FLAGS="-DCMAKE_INSTALL_PREFIX=/tmp/nvim" That's long and hard to remember. Following the conventions of other Makefiles, this now works as well and is equivalent: make PREFIX=/tmp/nvim --- Makefile | 4 ++++ contrib/local.mk.example | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8fdf007260..ef4b9cdcb5 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,10 @@ CLINT_ERRORS_FILE_PATH := /reports/clint/errors.json BUILD_TYPE ?= $(shell (type ninja > /dev/null 2>&1 && echo "Ninja") || \ echo "Unix Makefiles") +ifneq (,$(PREFIX)) + CMAKE_FLAGS += -DCMAKE_INSTALL_PREFIX:PATH="$(PREFIX)" +endif + ifeq (,$(BUILD_TOOL)) ifeq (Ninja,$(BUILD_TYPE)) ifneq ($(shell cmake --help 2>/dev/null | grep Ninja),) diff --git a/contrib/local.mk.example b/contrib/local.mk.example index a0b2d034e1..6959107ea2 100644 --- a/contrib/local.mk.example +++ b/contrib/local.mk.example @@ -2,7 +2,7 @@ # Individual entries must be uncommented to take effect. # By default, the installation prefix is '/usr/local'. -# CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=/usr/local/nvim-latest +# PREFIX := /usr/local/nvim-latest # These CFLAGS can be used in addition to those specified in CMakeLists.txt: # CMAKE_EXTRA_FLAGS="-DCMAKE_C_FLAGS=-ftrapv -Wlogical-op"