summaryrefslogtreecommitdiff
path: root/data/vim/patches/8.1.0222
blob: 1ee0bfcd5a540c35809a407cd2c5d852733a5463 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
To: vim_dev@googlegroups.com
Subject: Patch 8.1.0222
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.1.0222
Problem:    Errors are reported for "make install".
Solution:   Skip missing language files. (Christian Brabandt, closes #3254)
Files:	    src/installman.sh


*** ../vim-8.1.0221/src/installman.sh	2017-04-21 22:52:39.000000000 +0200
--- src/installman.sh	2018-07-28 18:10:51.863723506 +0200
***************
*** 48,88 ****
  
  if test $what = "install"; then
     # vim.1
!    echo installing $destdir/$exename.1
!    LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
! 	   -e s+$vimloc/doc+$helpsubloc+ \
! 	   -e s+$vimloc/print+$printsubloc+ \
! 	   -e s+$vimloc/syntax+$synsubloc+ \
! 	   -e s+$vimloc/tutor+$tutorsubloc+ \
! 	   -e s+$vimloc/vimrc+$vimrcloc/vimrc+ \
! 	   -e s+$vimloc/gvimrc+$vimrcloc/gvimrc+ \
! 	   -e s+$vimloc/menu.vim+$scriptloc/menu.vim+ \
! 	   -e s+$vimloc/bugreport.vim+$scriptloc/bugreport.vim+ \
! 	   -e s+$vimloc/filetype.vim+$scriptloc/filetype.vim+ \
! 	   -e s+$vimloc/scripts.vim+$scriptloc/scripts.vim+ \
! 	   -e s+$vimloc/optwin.vim+$scriptloc/optwin.vim+ \
! 	   -e 's+$vimloc/\*.ps+$scriptloc/\*.ps+' \
! 	   $helpsource/vim$langadd.1 > $destdir/$exename.1
!    chmod $manmod $destdir/$exename.1
  
     # vimtutor.1
!    echo installing $destdir/$exename""tutor.1
!    LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
! 	   -e s+$vimloc/tutor+$tutorsubloc+ \
! 	   $helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1
!    chmod $manmod $destdir/$exename""tutor.1
  
     # vimdiff.1
!    echo installing $destdir/$vimdiffname.1
!    cp $helpsource/vimdiff$langadd.1 $destdir/$vimdiffname.1
!    chmod $manmod $destdir/$vimdiffname.1
  
     # evim.1
!    echo installing $destdir/$evimname.1
!    LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
! 	   -e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
! 	   $helpsource/evim$langadd.1 > $destdir/$evimname.1
!    chmod $manmod $destdir/$evimname.1
  fi
  
  if test $what = "uninstall"; then
--- 48,96 ----
  
  if test $what = "install"; then
     # vim.1
!    if test -r $helpsource/vim$langadd.1; then
!       echo installing $destdir/$exename.1
!       LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
! 	      -e s+$vimloc/doc+$helpsubloc+ \
! 	      -e s+$vimloc/print+$printsubloc+ \
! 	      -e s+$vimloc/syntax+$synsubloc+ \
! 	      -e s+$vimloc/tutor+$tutorsubloc+ \
! 	      -e s+$vimloc/vimrc+$vimrcloc/vimrc+ \
! 	      -e s+$vimloc/gvimrc+$vimrcloc/gvimrc+ \
! 	      -e s+$vimloc/menu.vim+$scriptloc/menu.vim+ \
! 	      -e s+$vimloc/bugreport.vim+$scriptloc/bugreport.vim+ \
! 	      -e s+$vimloc/filetype.vim+$scriptloc/filetype.vim+ \
! 	      -e s+$vimloc/scripts.vim+$scriptloc/scripts.vim+ \
! 	      -e s+$vimloc/optwin.vim+$scriptloc/optwin.vim+ \
! 	      -e 's+$vimloc/\*.ps+$scriptloc/\*.ps+' \
! 	      $helpsource/vim$langadd.1 > $destdir/$exename.1
!       chmod $manmod $destdir/$exename.1
!    fi
  
     # vimtutor.1
!    if test -r $helpsource/vimtutor$langadd.1; then
!       echo installing $destdir/$exename""tutor.1
!       LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
! 	      -e s+$vimloc/tutor+$tutorsubloc+ \
! 	      $helpsource/vimtutor$langadd.1 > $destdir/$exename""tutor.1
!       chmod $manmod $destdir/$exename""tutor.1
!    fi
  
     # vimdiff.1
!    if test -r $helpsource/vimdiff$langadd.1; then
!       echo installing $destdir/$vimdiffname.1
!       cp $helpsource/vimdiff$langadd.1 $destdir/$vimdiffname.1
!       chmod $manmod $destdir/$vimdiffname.1
!    fi
  
     # evim.1
!    if test -r $helpsource/evim$langadd.1; then
!       echo installing $destdir/$evimname.1
!       LC_ALL=C sed -e s+/usr/local/lib/vim+$vimloc+ \
! 	      -e s+$vimloc/evim.vim+$scriptloc/evim.vim+ \
! 	      $helpsource/evim$langadd.1 > $destdir/$evimname.1
!       chmod $manmod $destdir/$evimname.1
!    fi
  fi
  
  if test $what = "uninstall"; then
***************
*** 105,111 ****
     fi
  fi
  
! if test $what = "xxd"; then
     echo installing $destdir/xxd.1
     cp $helpsource/xxd$langadd.1 $destdir/xxd.1
     chmod $manmod $destdir/xxd.1
--- 113,119 ----
     fi
  fi
  
! if test $what = "xxd" -a -r "$helpsource/xxd${langadd}.1"; then
     echo installing $destdir/xxd.1
     cp $helpsource/xxd$langadd.1 $destdir/xxd.1
     chmod $manmod $destdir/xxd.1
*** ../vim-8.1.0221/src/version.c	2018-07-28 17:29:15.757096343 +0200
--- src/version.c	2018-07-28 18:15:50.441981506 +0200
***************
*** 800,801 ****
--- 800,803 ----
  {   /* Add new patch number below this line */
+ /**/
+     222,
  /**/

-- 
"A mouse can be just as dangerous as a bullet or a bomb."
             (US Representative Lamar Smith, R-Texas)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///