]>
Commit | Line | Data |
---|---|---|
60178ca2 ER |
1 | To: vim-dev@vim.org |
2 | Subject: Patch 7.1.327 | |
3 | Fcc: outbox | |
4 | From: Bram Moolenaar <Bram@moolenaar.net> | |
5 | Mime-Version: 1.0 | |
6 | Content-Type: text/plain; charset=ISO-8859-1 | |
7 | Content-Transfer-Encoding: 8bit | |
8 | ------------ | |
9 | ||
10 | Patch 7.1.327 | |
11 | Problem: The GUI tutor is installed when there is no GUI version. | |
12 | Solution: Only install gvimtutor when building a GUI version. | |
13 | Files: src/Makefile | |
14 | ||
15 | ||
16 | *** ../vim-7.1.326/src/Makefile Fri Jun 20 18:51:06 2008 | |
17 | --- src/Makefile Fri Jun 20 21:26:46 2008 | |
18 | *************** | |
19 | *** 1113,1119 **** | |
20 | GTK_LIBS_DIR = $(GUI_LIB_LOC) | |
21 | GTK_LIBS1 = | |
22 | GTK_LIBS2 = $(GTK_LIBNAME) | |
23 | ! GTK_INSTALL = install_normal | |
24 | GTK_TARGETS = installglinks | |
25 | GTK_MAN_TARGETS = yes | |
26 | GTK_TESTTARGET = gui | |
27 | --- 1113,1119 ---- | |
28 | GTK_LIBS_DIR = $(GUI_LIB_LOC) | |
29 | GTK_LIBS1 = | |
30 | GTK_LIBS2 = $(GTK_LIBNAME) | |
31 | ! GTK_INSTALL = install_normal install_gui_extra | |
32 | GTK_TARGETS = installglinks | |
33 | GTK_MAN_TARGETS = yes | |
34 | GTK_TESTTARGET = gui | |
35 | *************** | |
36 | *** 1130,1136 **** | |
37 | MOTIF_LIBS_DIR = $(GUI_LIB_LOC) | |
38 | MOTIF_LIBS1 = | |
39 | MOTIF_LIBS2 = $(MOTIF_LIBNAME) -lXt | |
40 | ! MOTIF_INSTALL = install_normal | |
41 | MOTIF_TARGETS = installglinks | |
42 | MOTIF_MAN_TARGETS = yes | |
43 | MOTIF_TESTTARGET = gui | |
44 | --- 1130,1136 ---- | |
45 | MOTIF_LIBS_DIR = $(GUI_LIB_LOC) | |
46 | MOTIF_LIBS1 = | |
47 | MOTIF_LIBS2 = $(MOTIF_LIBNAME) -lXt | |
48 | ! MOTIF_INSTALL = install_normal install_gui_extra | |
49 | MOTIF_TARGETS = installglinks | |
50 | MOTIF_MAN_TARGETS = yes | |
51 | MOTIF_TESTTARGET = gui | |
52 | *************** | |
53 | *** 1160,1166 **** | |
54 | ATHENA_LIBS_DIR = $(GUI_LIB_LOC) | |
55 | ATHENA_LIBS1 = $(XAW_LIB) | |
56 | ATHENA_LIBS2 = -lXt | |
57 | ! ATHENA_INSTALL = install_normal | |
58 | ATHENA_TARGETS = installglinks | |
59 | ATHENA_MAN_TARGETS = yes | |
60 | ATHENA_TESTTARGET = gui | |
61 | --- 1160,1166 ---- | |
62 | ATHENA_LIBS_DIR = $(GUI_LIB_LOC) | |
63 | ATHENA_LIBS1 = $(XAW_LIB) | |
64 | ATHENA_LIBS2 = -lXt | |
65 | ! ATHENA_INSTALL = install_normal install_gui_extra | |
66 | ATHENA_TARGETS = installglinks | |
67 | ATHENA_MAN_TARGETS = yes | |
68 | ATHENA_TESTTARGET = gui | |
69 | *************** | |
70 | *** 1178,1184 **** | |
71 | NEXTAW_LIBS_DIR = $(GUI_LIB_LOC) | |
72 | NEXTAW_LIBS1 = $(NEXTAW_LIB) | |
73 | NEXTAW_LIBS2 = -lXt | |
74 | ! NEXTAW_INSTALL = install_normal | |
75 | NEXTAW_TARGETS = installglinks | |
76 | NEXTAW_MAN_TARGETS = yes | |
77 | NEXTAW_TESTTARGET = gui | |
78 | --- 1178,1184 ---- | |
79 | NEXTAW_LIBS_DIR = $(GUI_LIB_LOC) | |
80 | NEXTAW_LIBS1 = $(NEXTAW_LIB) | |
81 | NEXTAW_LIBS2 = -lXt | |
82 | ! NEXTAW_INSTALL = install_normal install_gui_extra | |
83 | NEXTAW_TARGETS = installglinks | |
84 | NEXTAW_MAN_TARGETS = yes | |
85 | NEXTAW_TESTTARGET = gui | |
86 | *************** | |
87 | *** 1203,1209 **** | |
88 | PHOTONGUI_LIBS_DIR = | |
89 | PHOTONGUI_LIBS1 = -lph -lphexlib | |
90 | PHOTONGUI_LIBS2 = | |
91 | ! PHOTONGUI_INSTALL = install_normal | |
92 | PHOTONGUI_TARGETS = installglinks | |
93 | PHOTONGUI_MAN_TARGETS = yes | |
94 | PHOTONGUI_TESTTARGET = gui | |
95 | --- 1203,1209 ---- | |
96 | PHOTONGUI_LIBS_DIR = | |
97 | PHOTONGUI_LIBS1 = -lph -lphexlib | |
98 | PHOTONGUI_LIBS2 = | |
99 | ! PHOTONGUI_INSTALL = install_normal install_gui_extra | |
100 | PHOTONGUI_TARGETS = installglinks | |
101 | PHOTONGUI_MAN_TARGETS = yes | |
102 | PHOTONGUI_TESTTARGET = gui | |
103 | *************** | |
104 | *** 1219,1225 **** | |
105 | CARBONGUI_LIBS_DIR = | |
106 | CARBONGUI_LIBS1 = -framework Carbon | |
107 | CARBONGUI_LIBS2 = | |
108 | ! CARBONGUI_INSTALL = install_macosx | |
109 | CARBONGUI_TARGETS = | |
110 | CARBONGUI_MAN_TARGETS = | |
111 | CARBONGUI_TESTTARGET = gui | |
112 | --- 1219,1225 ---- | |
113 | CARBONGUI_LIBS_DIR = | |
114 | CARBONGUI_LIBS1 = -framework Carbon | |
115 | CARBONGUI_LIBS2 = | |
116 | ! CARBONGUI_INSTALL = install_macosx install_gui_extra | |
117 | CARBONGUI_TARGETS = | |
118 | CARBONGUI_MAN_TARGETS = | |
119 | CARBONGUI_TESTTARGET = gui | |
120 | *************** | |
121 | *** 1741,1746 **** | |
122 | --- 1741,1755 ---- | |
123 | cd $(PODIR); $(MAKE) checkclean; \ | |
124 | fi | |
125 | ||
126 | + install: $(GUI_INSTALL) | |
127 | + | |
128 | + install_normal: installvim installtools $(INSTALL_LANGS) install-icons | |
129 | + | |
130 | + install_gui_extra: installgtutorbin | |
131 | + | |
132 | + installvim: installvimbin installtutorbin \ | |
133 | + installruntime installlinks installmanlinks | |
134 | + | |
135 | # | |
136 | # Avoid overwriting an existing executable, somebody might be running it and | |
137 | # overwriting it could cause it to crash. Deleting it is OK, it won't be | |
138 | *************** | |
139 | *** 1750,1762 **** | |
140 | # If you want to keep an older version, rename it before running "make | |
141 | # install". | |
142 | # | |
143 | - install: $(GUI_INSTALL) | |
144 | - | |
145 | - install_normal: installvim installtools $(INSTALL_LANGS) install-icons | |
146 | - | |
147 | - installvim: installvimbin installtutorbin \ | |
148 | - installruntime installlinks installmanlinks | |
149 | - | |
150 | installvimbin: $(VIMTARGET) $(DESTDIR)$(exec_prefix) $(DEST_BIN) | |
151 | -if test -f $(DEST_BIN)/$(VIMTARGET); then \ | |
152 | mv -f $(DEST_BIN)/$(VIMTARGET) $(DEST_BIN)/$(VIMNAME).rm; \ | |
153 | --- 1759,1764 ---- | |
154 | *************** | |
155 | *** 1872,1877 **** | |
156 | --- 1874,1881 ---- | |
157 | installtutorbin: $(DEST_VIM) | |
158 | $(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor | |
159 | chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor | |
160 | + | |
161 | + installgtutorbin: $(DEST_VIM) | |
162 | $(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor | |
163 | chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor | |
164 | ||
165 | *** ../vim-7.1.326/src/version.c Fri Jun 20 18:51:01 2008 | |
166 | --- src/version.c Fri Jun 20 21:26:52 2008 | |
167 | *************** | |
168 | *** 668,669 **** | |
169 | --- 673,676 ---- | |
170 | { /* Add new patch number below this line */ | |
171 | + /**/ | |
172 | + 327, | |
173 | /**/ | |
174 | ||
175 | -- | |
176 | hundred-and-one symptoms of being an internet addict: | |
177 | 56. You leave the modem speaker on after connecting because you think it | |
178 | sounds like the ocean wind...the perfect soundtrack for "surfing the net". | |
179 | ||
180 | /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ | |
181 | /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ | |
182 | \\\ download, build and distribute -- http://www.A-A-P.org /// | |
183 | \\\ help me help AIDS victims -- http://ICCF-Holland.org /// |