From b41507927b3773f6fd0de3bdcc72fb0417d1c909 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 17 Jul 2019 16:38:11 +0200 Subject: [PATCH] build: fix handling of install prefix with CMAKE_EXTRA_FLAGS (#10530) Append `CMAKE_INSTALL_PREFIX` to any given `CMAKE_EXTRA_FLAGS` always. Regressed in 5031e3298. Fixes https://github.com/neovim/neovim/issues/10524. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 94db1c853a..6d8f6cb07d 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ CMAKE_INSTALL_PREFIX := $(shell echo $(CMAKE_EXTRA_FLAGS) | 2>/dev/null \ grep -o 'CMAKE_INSTALL_PREFIX=[^ ]\+' | cut -d '=' -f2) endif ifneq (,$(CMAKE_INSTALL_PREFIX)) -CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_PREFIX) +override CMAKE_EXTRA_FLAGS += -DCMAKE_INSTALL_PREFIX=$(CMAKE_INSTALL_PREFIX) checkprefix: @if [ -f build/.ran-cmake ]; then \