]>
Commit | Line | Data |
---|---|---|
90ac026d ER |
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 | |
4ca24e06 | 3 | @@ -1573,24 +1573,10 @@ init_locale(void) |
90ac026d ER |
4 | |
5 | # ifdef FEAT_GETTEXT | |
6 | { | |
7 | - int mustfree = FALSE; | |
8 | - char_u *p; | |
9 | - | |
10 | # ifdef DYNAMIC_GETTEXT | |
11 | /* Initialize the gettext library */ | |
4ca24e06 | 12 | dyn_libintl_init(); |
90ac026d | 13 | # endif |
4ca24e06 AM |
14 | - /* expand_env() doesn't work yet, because g_chartab[] is not |
15 | - * initialized yet, call vim_getenv() directly */ | |
90ac026d ER |
16 | - p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree); |
17 | - if (p != NULL && *p != NUL) | |
18 | - { | |
19 | - vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p); | |
20 | - bindtextdomain(VIMPACKAGE, (char *)NameBuff); | |
21 | - } | |
22 | - if (mustfree) | |
23 | - vim_free(p); | |
4ca24e06 | 24 | - textdomain(VIMPACKAGE); |
90ac026d ER |
25 | } |
26 | # endif | |
4ca24e06 | 27 | } |
90ac026d ER |
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 | |
03d4279c AM |
30 | @@ -4215,22 +4215,6 @@ |
31 | putenv((char *)envbuf); | |
32 | } | |
33 | #endif | |
90ac026d | 34 | -#ifdef FEAT_GETTEXT |
03d4279c AM |
35 | - /* |
36 | - * When setting $VIMRUNTIME adjust the directory to find message | |
37 | - * translations to $VIMRUNTIME/lang. | |
38 | - */ | |
39 | - if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0) | |
40 | - { | |
41 | - char_u *buf = concat_str(val, (char_u *)"/lang"); | |
90ac026d | 42 | - |
03d4279c AM |
43 | - if (buf != NULL) |
44 | - { | |
45 | - bindtextdomain(VIMPACKAGE, (char *)buf); | |
46 | - vim_free(buf); | |
47 | - } | |
48 | - } | |
90ac026d | 49 | -#endif |
03d4279c AM |
50 | } |
51 | ||
52 | #if defined(FEAT_CMDL_COMPL) || defined(PROTO) | |
90ac026d ER |
53 | --- vim72/src/Makefile~ 2009-04-15 01:00:48.000000000 +0300 |
54 | +++ vim72/src/Makefile 2009-04-15 01:19:18.519171979 +0300 | |
55 | @@ -957,6 +957,7 @@ | |
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) | |
63 | @@ -1325,6 +1326,7 @@ | |
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) | |
71 | @@ -1988,7 +1988,7 @@ | |
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; \ | |
78 | fi | |
79 | if test -d $(LANGSOURCE); then \ | |
cdd976c0 ER |
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 | |
82 | @@ -151,6 +151,7 @@ | |
c37eb575 | 83 | |
cdd976c0 | 84 | install: $(MOFILES) $(MOCONVERTED) |
c37eb575 ER |
85 | @$(MAKE) prefixcheck |
86 | + install -d $(LOCALEDIR); \ | |
cdd976c0 | 87 | for lang in $(LANGUAGES) $(CONVERTED); do \ |
c37eb575 ER |
88 | dir=$(LOCALEDIR)/$$lang/; \ |
89 | if test ! -x "$$dir"; then \ |