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 @@ -4056,17 +4056,6 @@
31 vim_setenv((char_u *)"VIMRUNTIME", p);
32 didset_vimruntime = TRUE;
35 - char_u *buf = concat_str(p, (char_u *)"/lang");
39 - bindtextdomain(VIMPACKAGE, (char *)buf);
47 --- vim72/src/Makefile~ 2009-04-15 01:00:48.000000000 +0300
48 +++ vim72/src/Makefile 2009-04-15 01:19:18.519171979 +0300
50 PLUGSUBLOC = $(VIMRTLOC)$(PLUGSUBDIR)
51 FTPLUGSUBLOC = $(VIMRTLOC)$(FTPLUGSUBDIR)
52 LANGSUBLOC = $(VIMRTLOC)$(LANGSUBDIR)
53 +LOCALESUBLOC = $(DATADIR)/locale
54 COMPSUBLOC = $(VIMRTLOC)$(COMPSUBDIR)
55 KMAPSUBLOC = $(VIMRTLOC)$(KMAPSUBDIR)
56 MACROSUBLOC = $(VIMRTLOC)$(MACROSUBDIR)
58 DEST_PLUG = $(DESTDIR)$(PLUGSUBLOC)
59 DEST_FTP = $(DESTDIR)$(FTPLUGSUBLOC)
60 DEST_LANG = $(DESTDIR)$(LANGSUBLOC)
61 +DEST_LOCALE = $(DESTDIR)$(LOCALESUBLOC)
62 DEST_COMP = $(DESTDIR)$(COMPSUBLOC)
63 DEST_KMAP = $(DESTDIR)$(KMAPSUBLOC)
64 DEST_MACRO = $(DESTDIR)$(MACROSUBLOC)
66 -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
67 $(DEST_MAN_RU_U) $(INSTALLMLARGS)
68 if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
69 - cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
70 + cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LOCALE) \
71 INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
73 if test -d $(LANGSOURCE); then \
74 --- vim72/src/po/Makefile~ 2008-07-24 21:52:54.000000000 +0300
75 +++ vim72/src/po/Makefile 2009-04-15 11:25:53.058913958 +0300
80 + install -d $(LOCALEDIR); \
81 for lang in $(LANGUAGES); do \
82 dir=$(LOCALEDIR)/$$lang/; \
83 if test ! -x "$$dir"; then \