]> git.ipfire.org Git - ipfire-2.x.git/blame - src/patches/vim-7.2-mandir-1.patch
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
[ipfire-2.x.git] / src / patches / vim-7.2-mandir-1.patch
CommitLineData
90d372c4
MT
1Submitted By: Alexander E. Patrakov
2Date: 2006-05-27
3Initial Package Version: 7.0
4Upstream status: LFS specific
5Description: Adjusts installation of manual pages to meet Man-DB expectations.
6
7 Additional change to explicitly install the man pages into
8 /usr/share/man instead of /usr/man by Ag Hatzim.
9
10--- vim70/src/Makefile.orig 2006-05-27 12:49:31.767959808 +0300
11+++ vim70/src/Makefile 2006-05-27 12:49:55.778309680 +0300
12@@ -867,7 +867,7 @@
13 # Uncomment the next line to install Vim in "/usr/bin"
14 #BINDIR = /usr/bin
15 # Uncomment the next line to install Vim manuals in "/usr/share/man/man1"
16-#MANDIR = /usr/share/man
17+MANDIR = /usr/share/man
18 # Uncomment the next line to install Vim help files in "/usr/share/vim"
19 #DATADIR = /usr/share
20
21@@ -1325,7 +1325,7 @@
22 DEST_MAN_PL = $(DEST_MAN_TOP)/pl$(MAN1DIR)
23 DEST_MAN_PL_I = $(DEST_MAN_TOP)/pl.ISO8859-2$(MAN1DIR)
24 DEST_MAN_PL_U = $(DEST_MAN_TOP)/pl.UTF-8$(MAN1DIR)
25-DEST_MAN_RU = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR)
26+DEST_MAN_RU = $(DEST_MAN_TOP)/ru$(MAN1DIR)
27 DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR)
28
29 # BASIC_SRC: files that are always used
30@@ -1905,52 +1905,24 @@
31 # install the language specific files for tools, if they were unpacked
32 install-tool-languages:
33 -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
34- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
35- -$(SHELL) ./installman.sh xxd $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
36 -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
37- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
38- -$(SHELL) ./installman.sh xxd $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
39 -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
40- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
41- -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
42 -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
43- -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
44
45 # install the language specific files, if they were unpacked
46 install-languages: languages $(DEST_LANG) $(DEST_KMAP)
47 -$(SHELL) ./installman.sh install $(DEST_MAN_FR) "-fr" $(INSTALLMANARGS)
48- -$(SHELL) ./installman.sh install $(DEST_MAN_FR_I) "-fr" $(INSTALLMANARGS)
49- -$(SHELL) ./installman.sh install $(DEST_MAN_FR_U) "-fr.UTF-8" $(INSTALLMANARGS)
50 -$(SHELL) ./installman.sh install $(DEST_MAN_IT) "-it" $(INSTALLMANARGS)
51- -$(SHELL) ./installman.sh install $(DEST_MAN_IT_I) "-it" $(INSTALLMANARGS)
52- -$(SHELL) ./installman.sh install $(DEST_MAN_IT_U) "-it.UTF-8" $(INSTALLMANARGS)
53 -$(SHELL) ./installman.sh install $(DEST_MAN_PL) "-pl" $(INSTALLMANARGS)
54- -$(SHELL) ./installman.sh install $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS)
55- -$(SHELL) ./installman.sh install $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS)
56 -$(SHELL) ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS)
57- -$(SHELL) ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS)
58 -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
59 $(DEST_MAN_FR) $(INSTALLMLARGS)
60 -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
61- $(DEST_MAN_FR_I) $(INSTALLMLARGS)
62- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
63- $(DEST_MAN_FR_U) $(INSTALLMLARGS)
64- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
65 $(DEST_MAN_IT) $(INSTALLMLARGS)
66 -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
67- $(DEST_MAN_IT_I) $(INSTALLMLARGS)
68- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
69- $(DEST_MAN_IT_U) $(INSTALLMLARGS)
70- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
71 $(DEST_MAN_PL) $(INSTALLMLARGS)
72 -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
73- $(DEST_MAN_PL_I) $(INSTALLMLARGS)
74- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
75- $(DEST_MAN_PL_U) $(INSTALLMLARGS)
76- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
77 $(DEST_MAN_RU) $(INSTALLMLARGS)
78- -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
79- $(DEST_MAN_RU_U) $(INSTALLMLARGS)
80 if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
81 cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
82 INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \