4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: The GUI tutor is installed when there is no GUI version.
12 Solution: Only install gvimtutor when building a GUI version.
16 *** ../vim-7.1.326/src/Makefile Fri Jun 20 18:51:06 2008
17 --- src/Makefile Fri Jun 20 21:26:46 2008
20 GTK_LIBS_DIR = $(GUI_LIB_LOC)
22 GTK_LIBS2 = $(GTK_LIBNAME)
23 ! GTK_INSTALL = install_normal
24 GTK_TARGETS = installglinks
28 GTK_LIBS_DIR = $(GUI_LIB_LOC)
30 GTK_LIBS2 = $(GTK_LIBNAME)
31 ! GTK_INSTALL = install_normal install_gui_extra
32 GTK_TARGETS = installglinks
37 MOTIF_LIBS_DIR = $(GUI_LIB_LOC)
39 MOTIF_LIBS2 = $(MOTIF_LIBNAME) -lXt
40 ! MOTIF_INSTALL = install_normal
41 MOTIF_TARGETS = installglinks
42 MOTIF_MAN_TARGETS = yes
43 MOTIF_TESTTARGET = gui
45 MOTIF_LIBS_DIR = $(GUI_LIB_LOC)
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
54 ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
55 ATHENA_LIBS1 = $(XAW_LIB)
57 ! ATHENA_INSTALL = install_normal
58 ATHENA_TARGETS = installglinks
59 ATHENA_MAN_TARGETS = yes
60 ATHENA_TESTTARGET = gui
62 ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
63 ATHENA_LIBS1 = $(XAW_LIB)
65 ! ATHENA_INSTALL = install_normal install_gui_extra
66 ATHENA_TARGETS = installglinks
67 ATHENA_MAN_TARGETS = yes
68 ATHENA_TESTTARGET = gui
71 NEXTAW_LIBS_DIR = $(GUI_LIB_LOC)
72 NEXTAW_LIBS1 = $(NEXTAW_LIB)
74 ! NEXTAW_INSTALL = install_normal
75 NEXTAW_TARGETS = installglinks
76 NEXTAW_MAN_TARGETS = yes
77 NEXTAW_TESTTARGET = gui
79 NEXTAW_LIBS_DIR = $(GUI_LIB_LOC)
80 NEXTAW_LIBS1 = $(NEXTAW_LIB)
82 ! NEXTAW_INSTALL = install_normal install_gui_extra
83 NEXTAW_TARGETS = installglinks
84 NEXTAW_MAN_TARGETS = yes
85 NEXTAW_TESTTARGET = gui
89 PHOTONGUI_LIBS1 = -lph -lphexlib
91 ! PHOTONGUI_INSTALL = install_normal
92 PHOTONGUI_TARGETS = installglinks
93 PHOTONGUI_MAN_TARGETS = yes
94 PHOTONGUI_TESTTARGET = gui
97 PHOTONGUI_LIBS1 = -lph -lphexlib
99 ! PHOTONGUI_INSTALL = install_normal install_gui_extra
100 PHOTONGUI_TARGETS = installglinks
101 PHOTONGUI_MAN_TARGETS = yes
102 PHOTONGUI_TESTTARGET = gui
106 CARBONGUI_LIBS1 = -framework Carbon
108 ! CARBONGUI_INSTALL = install_macosx
110 CARBONGUI_MAN_TARGETS =
111 CARBONGUI_TESTTARGET = gui
114 CARBONGUI_LIBS1 = -framework Carbon
116 ! CARBONGUI_INSTALL = install_macosx install_gui_extra
118 CARBONGUI_MAN_TARGETS =
119 CARBONGUI_TESTTARGET = gui
123 cd $(PODIR); $(MAKE) checkclean; \
126 + install: $(GUI_INSTALL)
128 + install_normal: installvim installtools $(INSTALL_LANGS) install-icons
130 + install_gui_extra: installgtutorbin
132 + installvim: installvimbin installtutorbin \
133 + installruntime installlinks installmanlinks
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
140 # If you want to keep an older version, rename it before running "make
143 - install: $(GUI_INSTALL)
145 - install_normal: installvim installtools $(INSTALL_LANGS) install-icons
147 - installvim: installvimbin installtutorbin \
148 - installruntime installlinks installmanlinks
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; \
157 installtutorbin: $(DEST_VIM)
158 $(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor
159 chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor
161 + installgtutorbin: $(DEST_VIM)
162 $(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor
163 chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor
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
170 { /* Add new patch number below this line */
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".
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 ///