Skip to content

Commit 73b4aba

Browse files
committed
patch 8.1.0222: errors are reported for "make install"
Problem: Errors are reported for "make install". Solution: Skip missing language files. (Christian Brabandt, closes #3254)
1 parent edd6aac commit 73b4aba

File tree

2 files changed

+40
-30
lines changed

2 files changed

+40
-30
lines changed

src/installman.sh

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -48,41 +48,49 @@ fi
4848

4949
if test $what = "install"; then
5050
# vim.1
51-
echo installing $destdir/$exename.1
52-
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
53-
-e s+$vimloc/doc+$helpsubloc+ \
54-
-e s+$vimloc/print+$printsubloc+ \
55-
-e s+$vimloc/syntax+$synsubloc+ \
56-
-e s+$vimloc/tutor+$tutorsubloc+ \
57-
-e s+$vimloc/vimrc+$vimrcloc/vimrc+ \
58-
-e s+$vimloc/gvimrc+$vimrcloc/gvimrc+ \
59-
-e s+$vimloc/menu.vim+$scriptloc/menu.vim+ \
60-
-e s+$vimloc/bugreport.vim+$scriptloc/bugreport.vim+ \
61-
-e s+$vimloc/filetype.vim+$scriptloc/filetype.vim+ \
62-
-e s+$vimloc/scripts.vim+$scriptloc/scripts.vim+ \
63-
-e s+$vimloc/optwin.vim+$scriptloc/optwin.vim+ \
64-
-e 's+$vimloc/\*.ps+$scriptloc/\*.ps+' \
65-
$helpsource/vim$langadd.1 > $destdir/$exename.1
66-
chmod $manmod $destdir/$exename.1
51+
if test -r $helpsource/vim$langadd.1; then
52+
echo installing $destdir/$exename.1
53+
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
54+
-e s+$vimloc/doc+$helpsubloc+ \
55+
-e s+$vimloc/print+$printsubloc+ \
56+
-e s+$vimloc/syntax+$synsubloc+ \
57+
-e s+$vimloc/tutor+$tutorsubloc+ \
58+
-e s+$vimloc/vimrc+$vimrcloc/vimrc+ \
59+
-e s+$vimloc/gvimrc+$vimrcloc/gvimrc+ \
60+
-e s+$vimloc/menu.vim+$scriptloc/menu.vim+ \
61+
-e s+$vimloc/bugreport.vim+$scriptloc/bugreport.vim+ \
62+
-e s+$vimloc/filetype.vim+$scriptloc/filetype.vim+ \
63+
-e s+$vimloc/scripts.vim+$scriptloc/scripts.vim+ \
64+
-e s+$vimloc/optwin.vim+$scriptloc/optwin.vim+ \
65+
-e 's+$vimloc/\*.ps+$scriptloc/\*.ps+' \
66+
$helpsource/vim$langadd.1 > $destdir/$exename.1
67+
chmod $manmod $destdir/$exename.1
68+
fi
6769

6870
# vimtutor.1
69-
echo installing $destdir/$exename""tutor.1
70-
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
71-
-e s+$vimloc/tutor+$tutorsubloc+ \
72-
$helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1
73-
chmod $manmod $destdir/$exename""tutor.1
71+
if test -r $helpsource/vimtutor$langadd.1; then
72+
echo installing $destdir/$exename""tutor.1
73+
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
74+
-e s+$vimloc/tutor+$tutorsubloc+ \
75+
$helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1
76+
chmod $manmod $destdir/$exename""tutor.1
77+
fi
7478

7579
# vimdiff.1
76-
echo installing $destdir/$vimdiffname.1
77-
cp $helpsource/vimdiff$langadd.1 $destdir/$vimdiffname.1
78-
chmod $manmod $destdir/$vimdiffname.1
80+
if test -r $helpsource/vimdiff$langadd.1; then
81+
echo installing $destdir/$vimdiffname.1
82+
cp $helpsource/vimdiff$langadd.1 $destdir/$vimdiffname.1
83+
chmod $manmod $destdir/$vimdiffname.1
84+
fi
7985

8086
# evim.1
81-
echo installing $destdir/$evimname.1
82-
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
83-
-e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
84-
$helpsource/evim$langadd.1 > $destdir/$evimname.1
85-
chmod $manmod $destdir/$evimname.1
87+
if test -r $helpsource/evim$langadd.1; then
88+
echo installing $destdir/$evimname.1
89+
LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
90+
-e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
91+
$helpsource/evim$langadd.1 > $destdir/$evimname.1
92+
chmod $manmod $destdir/$evimname.1
93+
fi
8694
fi
8795

8896
if test $what = "uninstall"; then
@@ -105,7 +113,7 @@ if test $what = "uninstall"; then
105113
fi
106114
fi
107115

108-
if test $what = "xxd"; then
116+
if test $what = "xxd" -a -r "$helpsource/xxd${langadd}.1"; then
109117
echo installing $destdir/xxd.1
110118
cp $helpsource/xxd$langadd.1 $destdir/xxd.1
111119
chmod $manmod $destdir/xxd.1

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -798,6 +798,8 @@ static char *(features[]) =
798798

799799
static int included_patches[] =
800800
{ /* Add new patch number below this line */
801+
/**/
802+
222,
801803
/**/
802804
221,
803805
/**/

0 commit comments

Comments
 (0)