[arch-commits] Commit in vim/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Wednesday, November 19, 2014 @ 19:34:43
  Author: anatolik
Revision: 226614

Break dependency of vim-runtime installation to gvim

Modified:
  vim/trunk/PKGBUILD

----------+
 PKGBUILD |   34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-19 18:34:32 UTC (rev 226613)
+++ PKGBUILD	2014-11-19 18:34:43 UTC (rev 226614)
@@ -52,6 +52,28 @@
 }
 
 build() {
+  cd "${srcdir}"/vim-runtime-build
+
+  ./configure \
+    --prefix=/usr \
+    --localstatedir=/var/lib/vim \
+    --with-features=huge \
+    --with-compiledby='Arch Linux' \
+    --enable-gpm \
+    --enable-acl \
+    --with-x=no \
+    --disable-gui \
+    --enable-multibyte \
+    --enable-cscope \
+    --disable-netbeans \
+    --enable-perlinterp \
+    --disable-pythoninterp \
+    --disable-python3interp \
+    --disable-rubyinterp \
+    --disable-luainterp
+
+  make
+
   cd "${srcdir}"/vim-minimal-build
 
   ./configure \
@@ -279,8 +301,8 @@
     rm -f ex.1 view.1 # provided by (n)vi
   done
 
-  # Move the runtime for later packaging
-  mv "${pkgdir}"/usr/share/vim "${srcdir}"/runtime-install
+  # need to remove since this is provided by vim-runtime
+  rm -r "${pkgdir}"/usr/share/vim
 
   # freedesktop links
   install -Dm644 "${srcdir}"/gvim.desktop \
@@ -334,12 +356,12 @@
 
   cd "${srcdir}"/vim-runtime-build
 
-  # Install the runtime split from gvim
-  install -dm755 "${pkgdir}"/usr/share
-  mv "${srcdir}"/runtime-install "${pkgdir}"/usr/share/vim
+  (cd src && make -j1 VIMRCLOC=/etc DESTDIR="${pkgdir}" installruntime install-languages installtools)
+  # man and bin files belong to 'vim'
+  rm -r "${pkgdir}"/usr/share/man/ "${pkgdir}"/usr/bin/
 
   # Don't forget logtalk.dict
-  install -Dm644 "${srcdir}"/gvim-build/runtime/ftplugin/logtalk.dict \
+  install -Dm644 runtime/ftplugin/logtalk.dict \
     "${pkgdir}"/usr/share/vim/${_versiondir}/ftplugin/logtalk.dict
 
   # fix FS#17216