Skip to content

Commit

Permalink
Revert "Makefile: add PREFIX variable"
Browse files Browse the repository at this point in the history
This reverts commit c13f72e.

References neovim#5447.
  • Loading branch information
mhinz committed Oct 16, 2016
1 parent 97caabc commit 0fa4f98
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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),)
Expand Down
2 changes: 1 addition & 1 deletion contrib/local.mk.example
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 0fa4f98

Please sign in to comment.