X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/e1b16e505205eecf95e5cd3166ab97cefa09425b..b9a198c81203ef4a3aa4547e8b8da5a2e63ce8a9:/packages/vim-python/build.sh

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index 84f7b1cf..62048998 100755
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -3,7 +3,7 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python"
 
 # Vim 7.4 patches described at ftp://ftp.vim.org/pub/vim/patches/7.4/README
-TERMUX_PKG_VERSION=7.4.1589
+TERMUX_PKG_VERSION=7.4.2290
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
@@ -14,10 +14,12 @@ TERMUX_PKG_RM_AFTER_INSTALL='bin/rview bin/rvim bin/ex share/man/man1/evim.1 sha
 
 # vim-python:
 TERMUX_PKG_CONFLICTS="vim"
-CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.5m"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --enable-python3interp  --with-python3-config-dir=$TERMUX_PREFIX/lib/python3.5/config-3.5m/"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vi_cv_path_python3_pfx=$TERMUX_PREFIX vi_cv_var_python3_version=3.5"
 TERMUX_PKG_DESCRIPTION+=" - with python support"
+termux_step_pre_configure() {
+	CPPFLAGS+=" -I${TERMUX_PREFIX}/include/python3.5m"
+}
 
 termux_step_pre_configure () {
 	make distclean
@@ -34,4 +36,7 @@ termux_step_post_make_install () {
         cp $TERMUX_PREFIX/share/vim/vim74/tutor/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PKG_TMPDIR/
         rm -f $TERMUX_PREFIX/share/vim/vim74/tutor/*
         cp $TERMUX_PKG_TMPDIR/{tutor,tutor.vim,tutor.utf-8} $TERMUX_PREFIX/share/vim/vim74/tutor/
+
+	cd $TERMUX_PREFIX/bin
+	ln -f -s vim vi
 }