diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/po/Makefile | 4 | ||||
| -rw-r--r-- | src/testdir/Makefile | 2 | ||||
| -rw-r--r-- | src/testdir/test49.vim | 2 |
5 files changed, 11 insertions, 11 deletions
@@ -1,9 +1,9 @@ CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug -build/bin/vim: deps +build/bin/nvim: deps cd build && make -test: build/bin/vim +test: build/bin/nvim cd src/testdir && make deps: .deps/usr/lib/libuv.a @@ -23,4 +23,4 @@ clean: .PHONY: test deps cmake -.DEFAULT: build/bin/vim +.DEFAULT: build/bin/nvim diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5ae5662a88..e355979723 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,19 +12,19 @@ list(APPEND NEOVIM_SOURCES "${PROJECT_BINARY_DIR}/config/auto/pathdef.c") file( GLOB IO_SOURCES io/*.c ) -add_executable (vim ${NEOVIM_SOURCES} ${IO_SOURCES}) +add_executable (nvim ${NEOVIM_SOURCES} ${IO_SOURCES}) -target_link_libraries (vim m uv ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries (nvim m uv ${CMAKE_THREAD_LIBS_INIT}) include(CheckLibraryExists) check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP) if (HAVE_LIBTERMCAP) - target_link_libraries(vim termcap) + target_link_libraries(nvim termcap) else() check_library_exists(curses tgetent "" HAVE_LIBCURSES) if (HAVE_LIBCURSES) - target_link_libraries(vim curses) + target_link_libraries(nvim curses) else() message(FATAL_ERROR "can't find something resembling -ltermcap") endif() diff --git a/src/po/Makefile b/src/po/Makefile index e22c7f807e..d702b9f277 100644 --- a/src/po/Makefile +++ b/src/po/Makefile @@ -125,9 +125,9 @@ CHECKFILES = \ uk.cp1251.ck \ zh_CN.cp936.ck -PACKAGE = vim +PACKAGE = nvim SHELL = /bin/sh -VIM = ../../build/bin/vim +VIM = ../../build/bin/nvim # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext # tools 0.10.37, which use a slightly different .po file format that is not diff --git a/src/testdir/Makefile b/src/testdir/Makefile index 8915328a8f..16db2846c2 100644 --- a/src/testdir/Makefile +++ b/src/testdir/Makefile @@ -2,7 +2,7 @@ # Makefile to run all tests for Vim # -VIMPROG = ../../build/bin/vim +VIMPROG = ../../build/bin/nvim # Uncomment this line to use valgrind for memory leaks and extra warnings. # The output goes into a file "valgrind.testN" diff --git a/src/testdir/test49.vim b/src/testdir/test49.vim index f5e6d56bc3..21c2a0c582 100644 --- a/src/testdir/test49.vim +++ b/src/testdir/test49.vim @@ -456,7 +456,7 @@ function! ExtraVim(...) " messing up the user's viminfo file. let redirect = a:0 ? \ " -c 'au VimLeave * redir END' -c 'redir\\! >" . a:1 . "'" : "" - exec "!echo '" . debug_quits . "q' | ../../build/bin/vim -u NONE -N -Xes" . redirect . + exec "!echo '" . debug_quits . "q' | ../../build/bin/nvim -u NONE -N -Xes" . redirect . \ " -c 'debuggreedy|set viminfo+=nviminfo'" . \ " -c 'let ExtraVimBegin = " . extra_begin . "'" . \ " -c 'let ExtraVimResult = \"" . resultfile . "\"'" . breakpoints . |