vim-localedir.patch

   1 --- vim72/src/locale.c~ 2009-04-15 01:00:47.000000000 +0300
   2 +++ vim72/src/locale.c  2009-04-15 01:11:33.555899981 +0300
   3 @@ -1741,17 +1741,6 @@ init_locale(void)
   4         // Initialize the gettext library
   5         dyn_libintl_init();
   6  #  endif
   7 -       // expand_env() doesn't work yet, because g_chartab[] is not
   8 -       // initialized yet, call vim_getenv() directly
   9 -       p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
  10 -       if (p != NULL && *p != NUL)
  11 -       {
  12 -           vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
  13 -           bindtextdomain(VIMPACKAGE, (char *)NameBuff);
  14 -       }
  15 -       if (mustfree)
  16 -           vim_free(p);
  17 -       textdomain(VIMPACKAGE);
  18      }
  19  # endif
  20  }
  21 --- vim72/src/misc1.c~  2009-04-15 01:00:48.000000000 +0300
  22 +++ vim72/src/misc1.c   2009-04-15 01:13:00.319209732 +0300
  23 @@ -4215,22 +4215,6 @@
  24         putenv((char *)envbuf);
  25      }
  26  #endif
  27 -#ifdef FEAT_GETTEXT
  28 -    /*
  29 -     * When setting $VIMRUNTIME adjust the directory to find message
  30 -     * translations to $VIMRUNTIME/lang.
  31 -     */
  32 -    if (*val != NUL && STRICMP(name, "VIMRUNTIME") == 0)
  33 -    {
  34 -       char_u  *buf = concat_str(val, (char_u *)"/lang");
  35 -
  36 -       if (buf != NULL)
  37 -       {
  38 -           bindtextdomain(VIMPACKAGE, (char *)buf);
  39 -           vim_free(buf);
  40 -       }
  41 -    }
  42 -#endif
  43  }
  44
  45  #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
  46 --- vim72/src/Makefile~ 2009-04-15 01:00:48.000000000 +0300
  47 +++ vim72/src/Makefile  2009-04-15 01:19:18.519171979 +0300
  48 @@ -957,6 +957,7 @@
  49  PLUGSUBLOC     = $(VIMRTLOC)$(PLUGSUBDIR)
  50  FTPLUGSUBLOC   = $(VIMRTLOC)$(FTPLUGSUBDIR)
  51  LANGSUBLOC     = $(VIMRTLOC)$(LANGSUBDIR)
  52 +LOCALESUBLOC   = $(DATADIR)/locale
  53  COMPSUBLOC     = $(VIMRTLOC)$(COMPSUBDIR)
  54  KMAPSUBLOC     = $(VIMRTLOC)$(KMAPSUBDIR)
  55  MACROSUBLOC    = $(VIMRTLOC)$(MACROSUBDIR)
  56 @@ -1325,6 +1326,7 @@
  57  DEST_PLUG = $(DESTDIR)$(PLUGSUBLOC)
  58  DEST_FTP = $(DESTDIR)$(FTPLUGSUBLOC)
  59  DEST_LANG = $(DESTDIR)$(LANGSUBLOC)
  60 +DEST_LOCALE = $(DESTDIR)$(LOCALESUBLOC)
  61  DEST_COMP = $(DESTDIR)$(COMPSUBLOC)
  62  DEST_KMAP = $(DESTDIR)$(KMAPSUBLOC)
  63  DEST_MACRO = $(DESTDIR)$(MACROSUBLOC)
  64 @@ -1988,7 +1988,7 @@
  65         -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \
  66                 $(DEST_MAN_RU_U) $(INSTALLMLARGS)
  67         if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \
  68 -          cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \
  69 +          cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LOCALE) \
  70            INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
  71         fi
  72         if test -d $(LANGSOURCE); then \
  73 --- vim73/src/po/Makefile~      2013-02-22 17:28:18.000000000 +0200
  74 +++ vim73/src/po/Makefile       2013-02-22 17:46:40.771918175 +0200
  75 @@ -38,6 +38,7 @@ check: $(CHECKFILES)
  76
  77  install: $(MOFILES) $(MOCONVERTED)
  78         @$(MAKE) prefixcheck
  79 +       install -d $(LOCALEDIR); \
  80         for lang in $(LANGUAGES); do \
  81           dir=$(LOCALEDIR)/$$lang/; \
  82           if test ! -x "$$dir"; then \
  83