From 0fa4f98a05bbcb60b5c317fac0e70da3821688fe Mon Sep 17 00:00:00 2001 From: Marco Hinz Date: Sun, 16 Oct 2016 12:17:00 +0200 Subject: [PATCH] Revert "Makefile: add PREFIX variable" This reverts commit c13f72ee0a6600963a10e57155d2e814d56599e2. References #5447. --- Makefile | 4 ---- contrib/local.mk.example | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ef4b9cdcb5..8fdf007260 100644 --- a/Makefile +++ b/Makefile @@ -13,10 +13,6 @@ 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 6959107ea2..a0b2d034e1 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'. -# PREFIX := /usr/local/nvim-latest +# CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_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"