thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0222: errors are reported for "make install"

Browse Source 
Problem:    Errors are reported for "make install".
Solution:   Skip missing language files. (Christian Brabandt, closes #3254)
This commit is contained in:
Bram Moolenaar
2018-07-28 18:16:48 +02:00
parent edd6aacb01
commit 73b4abae5d
2 changed files with 40 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/installman.sh
View File

@@ -48,6 +48,7 @@ fi
if test $what = "install"; then if test $what = "install"; then
# vim.1 # vim.1
if test -r $helpsource/vim$langadd.1; then
echo installing $destdir/$exename.1 echo installing $destdir/$exename.1
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \ LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
-e s+$vimloc/doc+$helpsubloc+ \ -e s+$vimloc/doc+$helpsubloc+ \
@@ -64,26 +65,33 @@ if test $what = "install"; then
-e 's+$vimloc/\*.ps+$scriptloc/\*.ps+' \ -e 's+$vimloc/\*.ps+$scriptloc/\*.ps+' \
$helpsource/vim$langadd.1 > $destdir/$exename.1 $helpsource/vim$langadd.1 > $destdir/$exename.1
chmod $manmod $destdir/$exename.1 chmod $manmod $destdir/$exename.1
fi
# vimtutor.1 # vimtutor.1
if test -r $helpsource/vimtutor$langadd.1; then
echo installing $destdir/$exename""tutor.1 echo installing $destdir/$exename""tutor.1
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \ LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
-e s+$vimloc/tutor+$tutorsubloc+ \ -e s+$vimloc/tutor+$tutorsubloc+ \
$helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1 $helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1
chmod $manmod $destdir/$exename""tutor.1 chmod $manmod $destdir/$exename""tutor.1
fi
# vimdiff.1 # vimdiff.1
if test -r $helpsource/vimdiff$langadd.1; then
echo installing $destdir/$vimdiffname.1 echo installing $destdir/$vimdiffname.1
cp $helpsource/vimdiff$langadd.1 $destdir/$vimdiffname.1 cp $helpsource/vimdiff$langadd.1 $destdir/$vimdiffname.1
chmod $manmod $destdir/$vimdiffname.1 chmod $manmod $destdir/$vimdiffname.1
fi
# evim.1 # evim.1
if test -r $helpsource/evim$langadd.1; then
echo installing $destdir/$evimname.1 echo installing $destdir/$evimname.1
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \ LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
-e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \ -e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
$helpsource/evim$langadd.1 > $destdir/$evimname.1 $helpsource/evim$langadd.1 > $destdir/$evimname.1
chmod $manmod $destdir/$evimname.1 chmod $manmod $destdir/$evimname.1
fi fi
fi
if test $what = "uninstall"; then if test $what = "uninstall"; then
echo Checking for Vim manual pages in $destdir... echo Checking for Vim manual pages in $destdir...
@@ -105,7 +113,7 @@ if test $what = "uninstall"; then
fi fi
fi fi
if test $what = "xxd"; then if test $what = "xxd" -a -r "$helpsource/xxd${langadd}.1"; then
echo installing $destdir/xxd.1 echo installing $destdir/xxd.1
cp $helpsource/xxd$langadd.1 $destdir/xxd.1 cp $helpsource/xxd$langadd.1 $destdir/xxd.1
chmod $manmod $destdir/xxd.1 chmod $manmod $destdir/xxd.1

2
src/version.c
View File

@@ -798,6 +798,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
222,
/**/ /**/
221, 221,
/**/ /**/