1 --- vim72/src/main.c~ 2009-04-15 01:00:47.000000000 +0300
2 +++ vim72/src/main.c 2009-04-15 01:11:33.555899981 +0300
3 @@ -1382,23 +1382,10 @@
7 - int mustfree = FALSE;
10 # ifdef DYNAMIC_GETTEXT
11 /* Initialize the gettext library */
12 dyn_libintl_init(NULL);
14 - /* expand_env() doesn't work yet, because chartab[] is not initialized
15 - * yet, call vim_getenv() directly */
16 - p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
17 - if (p != NULL && *p != NUL)
19 - vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
20 - bindtextdomain(VIMPACKAGE, (char *)NameBuff);
24 textdomain(VIMPACKAGE);
27 --- vim72/src/misc1.c~ 2009-04-15 01:00:48.000000000 +0300
28 +++ vim72/src/misc1.c 2009-04-15 01:13:00.319209732 +0300
29 @@ -4215,22 +4215,6 @@
30 putenv((char *)envbuf);
35 - * When setting $VIMRUNTIME adjust the directory to find message
36 - * translations to $VIMRUNTIME/lang.
38 - if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0)
40 - char_u *buf = concat_str(val, (char_u *)"/lang");
44 - bindtextdomain(VIMPACKAGE, (char *)buf);
51 #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
52 --- vim72/src/Makefile~ 2009-04-15 01:00:48.000000000 +0300
53 +++ vim72/src/Makefile 2009-04-15 01:19:18.519171979 +0300
55 PLUGSUBLOC = $(VIMRTLOC)$(PLUGSUBDIR)
56 FTPLUGSUBLOC = $(VIMRTLOC)$(FTPLUGSUBDIR)
57 LANGSUBLOC = $(VIMRTLOC)$(LANGSUBDIR)
58 +LOCALESUBLOC = $(DATADIR)/locale
59 COMPSUBLOC = $(VIMRTLOC)$(COMPSUBDIR)
60 KMAPSUBLOC = $(VIMRTLOC)$(KMAPSUBDIR)
61 MACROSUBLOC = $(VIMRTLOC)$(MACROSUBDIR)
63 DEST_PLUG = $(DESTDIR)$(PLUGSUBLOC)
64 DEST_FTP = $(DESTDIR)$(FTPLUGSUBLOC)
65 DEST_LANG = $(DESTDIR)$(LANGSUBLOC)
66 +DEST_LOCALE = $(DESTDIR)$(LOCALESUBLOC)
67 DEST_COMP = $(DESTDIR)$(COMPSUBLOC)
68 DEST_KMAP = $(DESTDIR)$(KMAPSUBLOC)
69 DEST_MACRO = $(DESTDIR)$(MACROSUBLOC)
71 -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
72 $(DEST_MAN_RU_U) $(INSTALLMLARGS)
73 if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
74 - cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
75 + cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LOCALE) \
76 INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
78 if test -d $(LANGSOURCE); then \
79 --- vim73/src/po/Makefile~ 2013-02-22 17:28:18.000000000 +0200
80 +++ vim73/src/po/Makefile 2013-02-22 17:46:40.771918175 +0200
83 install: $(MOFILES) $(MOCONVERTED)
85 + install -d $(LOCALEDIR); \
86 for lang in $(LANGUAGES) $(CONVERTED); do \
87 dir=$(LOCALEDIR)/$$lang/; \
88 if test ! -x "$$dir"; then \