vim-localedir.patch

   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 @@
   4
   5  # ifdef FEAT_GETTEXT
   6      {
   7 -       int     mustfree = FALSE;
   8 -       char_u  *p;
   9 -
  10  #  ifdef DYNAMIC_GETTEXT
  11         /* Initialize the gettext library */
  12         dyn_libintl_init(NULL);
  13  #  endif
  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)
  18 -       {
  19 -           vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
  20 -           bindtextdomain(VIMPACKAGE, (char *)NameBuff);
  21 -       }
  22 -       if (mustfree)
  23 -           vim_free(p);
  24         textdomain(VIMPACKAGE);
  25      }
  26  # endif
  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);
  31      }
  32  #endif
  33 -#ifdef FEAT_GETTEXT
  34 -    /*
  35 -     * When setting $VIMRUNTIME adjust the directory to find message
  36 -     * translations to $VIMRUNTIME/lang.
  37 -     */
  38 -    if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0)
  39 -    {
  40 -       char_u  *buf = concat_str(val, (char_u *)"/lang");
  41 -
  42 -       if (buf != NULL)
  43 -       {
  44 -           bindtextdomain(VIMPACKAGE, (char *)buf);
  45 -           vim_free(buf);
  46 -       }
  47 -    }
  48 -#endif
  49  }
  50
  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
  54 @@ -957,6 +957,7 @@
  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)
  62 @@ -1325,6 +1326,7 @@
  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)
  70 @@ -1988,7 +1988,7 @@
  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; \
  77         fi
  78         if test -d $(LANGSOURCE); then \
  79 --- vim72/src/po/Makefile~      2008-07-24 21:52:54.000000000 +0300
  80 +++ vim72/src/po/Makefile       2009-04-15 11:25:53.058913958 +0300
  81 @@ -132,6 +132,7 @@
  82
  83  install: $(MOFILES)
  84         @$(MAKE) prefixcheck
  85 +       install -d $(LOCALEDIR); \
  86         for lang in $(LANGUAGES); do \
  87           dir=$(LOCALEDIR)/$$lang/; \
  88           if test ! -x "$$dir"; then \