Mirror of the Vim source from https://github.com/vim/vim
Révision | 371201c6b4c1538b593b5dc72f36c79a1f2644de (tree) |
---|---|
l'heure | 2008-06-21 04:29:35 |
Auteur | vimboss |
Commiter | vimboss |
updated for version 7.1-327
@@ -1113,7 +1113,7 @@ | ||
1113 | 1113 | GTK_LIBS_DIR = $(GUI_LIB_LOC) |
1114 | 1114 | GTK_LIBS1 = |
1115 | 1115 | GTK_LIBS2 = $(GTK_LIBNAME) |
1116 | -GTK_INSTALL = install_normal | |
1116 | +GTK_INSTALL = install_normal install_gui_extra | |
1117 | 1117 | GTK_TARGETS = installglinks |
1118 | 1118 | GTK_MAN_TARGETS = yes |
1119 | 1119 | GTK_TESTTARGET = gui |
@@ -1130,7 +1130,7 @@ | ||
1130 | 1130 | MOTIF_LIBS_DIR = $(GUI_LIB_LOC) |
1131 | 1131 | MOTIF_LIBS1 = |
1132 | 1132 | MOTIF_LIBS2 = $(MOTIF_LIBNAME) -lXt |
1133 | -MOTIF_INSTALL = install_normal | |
1133 | +MOTIF_INSTALL = install_normal install_gui_extra | |
1134 | 1134 | MOTIF_TARGETS = installglinks |
1135 | 1135 | MOTIF_MAN_TARGETS = yes |
1136 | 1136 | MOTIF_TESTTARGET = gui |
@@ -1160,7 +1160,7 @@ | ||
1160 | 1160 | ATHENA_LIBS_DIR = $(GUI_LIB_LOC) |
1161 | 1161 | ATHENA_LIBS1 = $(XAW_LIB) |
1162 | 1162 | ATHENA_LIBS2 = -lXt |
1163 | -ATHENA_INSTALL = install_normal | |
1163 | +ATHENA_INSTALL = install_normal install_gui_extra | |
1164 | 1164 | ATHENA_TARGETS = installglinks |
1165 | 1165 | ATHENA_MAN_TARGETS = yes |
1166 | 1166 | ATHENA_TESTTARGET = gui |
@@ -1178,7 +1178,7 @@ | ||
1178 | 1178 | NEXTAW_LIBS_DIR = $(GUI_LIB_LOC) |
1179 | 1179 | NEXTAW_LIBS1 = $(NEXTAW_LIB) |
1180 | 1180 | NEXTAW_LIBS2 = -lXt |
1181 | -NEXTAW_INSTALL = install_normal | |
1181 | +NEXTAW_INSTALL = install_normal install_gui_extra | |
1182 | 1182 | NEXTAW_TARGETS = installglinks |
1183 | 1183 | NEXTAW_MAN_TARGETS = yes |
1184 | 1184 | NEXTAW_TESTTARGET = gui |
@@ -1203,7 +1203,7 @@ | ||
1203 | 1203 | PHOTONGUI_LIBS_DIR = |
1204 | 1204 | PHOTONGUI_LIBS1 = -lph -lphexlib |
1205 | 1205 | PHOTONGUI_LIBS2 = |
1206 | -PHOTONGUI_INSTALL = install_normal | |
1206 | +PHOTONGUI_INSTALL = install_normal install_gui_extra | |
1207 | 1207 | PHOTONGUI_TARGETS = installglinks |
1208 | 1208 | PHOTONGUI_MAN_TARGETS = yes |
1209 | 1209 | PHOTONGUI_TESTTARGET = gui |
@@ -1219,7 +1219,7 @@ | ||
1219 | 1219 | CARBONGUI_LIBS_DIR = |
1220 | 1220 | CARBONGUI_LIBS1 = -framework Carbon |
1221 | 1221 | CARBONGUI_LIBS2 = |
1222 | -CARBONGUI_INSTALL = install_macosx | |
1222 | +CARBONGUI_INSTALL = install_macosx install_gui_extra | |
1223 | 1223 | CARBONGUI_TARGETS = |
1224 | 1224 | CARBONGUI_MAN_TARGETS = |
1225 | 1225 | CARBONGUI_TESTTARGET = gui |
@@ -1741,6 +1741,15 @@ | ||
1741 | 1741 | cd $(PODIR); $(MAKE) checkclean; \ |
1742 | 1742 | fi |
1743 | 1743 | |
1744 | +install: $(GUI_INSTALL) | |
1745 | + | |
1746 | +install_normal: installvim installtools $(INSTALL_LANGS) install-icons | |
1747 | + | |
1748 | +install_gui_extra: installgtutorbin | |
1749 | + | |
1750 | +installvim: installvimbin installtutorbin \ | |
1751 | + installruntime installlinks installmanlinks | |
1752 | + | |
1744 | 1753 | # |
1745 | 1754 | # Avoid overwriting an existing executable, somebody might be running it and |
1746 | 1755 | # overwriting it could cause it to crash. Deleting it is OK, it won't be |
@@ -1750,13 +1759,6 @@ | ||
1750 | 1759 | # If you want to keep an older version, rename it before running "make |
1751 | 1760 | # install". |
1752 | 1761 | # |
1753 | -install: $(GUI_INSTALL) | |
1754 | - | |
1755 | -install_normal: installvim installtools $(INSTALL_LANGS) install-icons | |
1756 | - | |
1757 | -installvim: installvimbin installtutorbin \ | |
1758 | - installruntime installlinks installmanlinks | |
1759 | - | |
1760 | 1762 | installvimbin: $(VIMTARGET) $(DESTDIR)$(exec_prefix) $(DEST_BIN) |
1761 | 1763 | -if test -f $(DEST_BIN)/$(VIMTARGET); then \ |
1762 | 1764 | mv -f $(DEST_BIN)/$(VIMTARGET) $(DEST_BIN)/$(VIMNAME).rm; \ |
@@ -1872,6 +1874,8 @@ | ||
1872 | 1874 | installtutorbin: $(DEST_VIM) |
1873 | 1875 | $(INSTALL_DATA) vimtutor $(DEST_BIN)/$(VIMNAME)tutor |
1874 | 1876 | chmod $(SCRIPTMOD) $(DEST_BIN)/$(VIMNAME)tutor |
1877 | + | |
1878 | +installgtutorbin: $(DEST_VIM) | |
1875 | 1879 | $(INSTALL_DATA) gvimtutor $(DEST_BIN)/$(GVIMNAME)tutor |
1876 | 1880 | chmod $(SCRIPTMOD) $(DEST_BIN)/$(GVIMNAME)tutor |
1877 | 1881 |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 327, | |
671 | +/**/ | |
670 | 672 | 326, |
671 | 673 | /**/ |
672 | 674 | 325, |