diff options
| author | Daniel Hahler <git@thequod.de> | 2019-07-17 16:38:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-17 16:38:11 +0200 |
| commit | b41507927b3773f6fd0de3bdcc72fb0417d1c909 (patch) | |
| tree | f4f3748916d5540d47f9813c05d8b09db6a82f07 | |
| parent | 58dd5fcc01ed51bdd9f82357f5d7131613624059 (diff) | |
| download | rneovim-b41507927b3773f6fd0de3bdcc72fb0417d1c909.tar.gz rneovim-b41507927b3773f6fd0de3bdcc72fb0417d1c909.tar.bz2 rneovim-b41507927b3773f6fd0de3bdcc72fb0417d1c909.zip | |
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.
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 \ |