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 @@ -1573,24 +1573,10 @@ init_locale(void)
7 - int mustfree = FALSE;
10 # ifdef DYNAMIC_GETTEXT
11 /* Initialize the gettext library */
14 - /* expand_env() doesn't work yet, because g_chartab[] is not
15 - * initialized 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);
28 --- vim72/src/misc1.c~ 2009-04-15 01:00:48.000000000 +0300
29 +++ vim72/src/misc1.c 2009-04-15 01:13:00.319209732 +0300
30 @@ -4215,22 +4215,6 @@
31 putenv((char *)envbuf);
36 - * When setting $VIMRUNTIME adjust the directory to find message
37 - * translations to $VIMRUNTIME/lang.
39 - if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0)
41 - char_u *buf = concat_str(val, (char_u *)"/lang");
45 - bindtextdomain(VIMPACKAGE, (char *)buf);
52 #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
53 --- vim72/src/Makefile~ 2009-04-15 01:00:48.000000000 +0300
54 +++ vim72/src/Makefile 2009-04-15 01:19:18.519171979 +0300
56 PLUGSUBLOC = $(VIMRTLOC)$(PLUGSUBDIR)
57 FTPLUGSUBLOC = $(VIMRTLOC)$(FTPLUGSUBDIR)
58 LANGSUBLOC = $(VIMRTLOC)$(LANGSUBDIR)
59 +LOCALESUBLOC = $(DATADIR)/locale
60 COMPSUBLOC = $(VIMRTLOC)$(COMPSUBDIR)
61 KMAPSUBLOC = $(VIMRTLOC)$(KMAPSUBDIR)
62 MACROSUBLOC = $(VIMRTLOC)$(MACROSUBDIR)
64 DEST_PLUG = $(DESTDIR)$(PLUGSUBLOC)
65 DEST_FTP = $(DESTDIR)$(FTPLUGSUBLOC)
66 DEST_LANG = $(DESTDIR)$(LANGSUBLOC)
67 +DEST_LOCALE = $(DESTDIR)$(LOCALESUBLOC)
68 DEST_COMP = $(DESTDIR)$(COMPSUBLOC)
69 DEST_KMAP = $(DESTDIR)$(KMAPSUBLOC)
70 DEST_MACRO = $(DESTDIR)$(MACROSUBLOC)
72 -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
73 $(DEST_MAN_RU_U) $(INSTALLMLARGS)
74 if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
75 - cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
76 + cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LOCALE) \
77 INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
79 if test -d $(LANGSOURCE); then \
80 --- vim73/src/po/Makefile~ 2013-02-22 17:28:18.000000000 +0200
81 +++ vim73/src/po/Makefile 2013-02-22 17:46:40.771918175 +0200
84 install: $(MOFILES) $(MOCONVERTED)
86 + install -d $(LOCALEDIR); \
87 for lang in $(LANGUAGES) $(CONVERTED); do \
88 dir=$(LOCALEDIR)/$$lang/; \
89 if test ! -x "$$dir"; then \