summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-04-21 10:40:16 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2017-04-21 10:40:16 +0000
commitd09c92b0429f87f19e5ece3d9194e23789dd0e85 (patch)
tree159ae13248bfbd47a624c829d368b87bd4b04a57 /Build
parent9f2cb52a67af527f2f754e2d39d83c89e8410938 (diff)
kpathsea: Update win32lib.c and mingw32.c (w32 only)
git-svn-id: svn://tug.org/texlive/trunk@43956 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog4
-rw-r--r--Build/source/texk/kpathsea/mingw32.c10
-rw-r--r--Build/source/texk/kpathsea/win32lib.c10
3 files changed, 20 insertions, 4 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index bae496f72a3..7942ea6df1b 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-21 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * win32lib.c, mingw32.c: Upsate texlive_gs_init() (w32 only).
+
2017-04-14 Karl Berry <karl@tug.org>
* texmf.cnf (shell_escape_commands): add texosquery-jre8.
diff --git a/Build/source/texk/kpathsea/mingw32.c b/Build/source/texk/kpathsea/mingw32.c
index a126ba4cfdd..10d21e492a5 100644
--- a/Build/source/texk/kpathsea/mingw32.c
+++ b/Build/source/texk/kpathsea/mingw32.c
@@ -409,7 +409,7 @@ void texlive_gs_init(void)
{
char *nptr, *path;
char tlgsbindir[512];
- char tlgslibdir[512];
+ char tlgslibdir[1024];
nptr = kpse_var_value("TEXLIVE_WINDOWS_EXTERNAL_GS");
if (nptr == NULL || !strcmp(nptr, "0") || !strcmp(nptr, "n") || !strcmp(nptr, "f")) {
if (nptr)
@@ -422,7 +422,13 @@ void texlive_gs_init(void)
strcpy(tlgslibdir, tlgsbindir);
strcat(tlgslibdir, "/lib;");
strcat(tlgslibdir, tlgsbindir);
- strcat(tlgslibdir, "/fonts");
+ strcat(tlgslibdir, "/fonts;");
+ strcat(tlgslibdir, tlgsbindir);
+ strcat(tlgslibdir, "/Resource/Init;");
+ strcat(tlgslibdir, tlgsbindir);
+ strcat(tlgslibdir, "/Resource;");
+ strcat(tlgslibdir, tlgsbindir);
+ strcat(tlgslibdir, "/kanji");
strcat(tlgsbindir, "/bin;");
free(nptr);
for(nptr = tlgsbindir; *nptr; nptr++) {
diff --git a/Build/source/texk/kpathsea/win32lib.c b/Build/source/texk/kpathsea/win32lib.c
index 9b4a615c6e2..9e7bba6707d 100644
--- a/Build/source/texk/kpathsea/win32lib.c
+++ b/Build/source/texk/kpathsea/win32lib.c
@@ -133,7 +133,7 @@ void texlive_gs_init(void)
{
char *nptr, *path;
char tlgsbindir[512];
- char tlgslibdir[512];
+ char tlgslibdir[1024];
nptr = kpse_var_value("TEXLIVE_WINDOWS_EXTERNAL_GS");
if (nptr == NULL || !strcmp(nptr, "0") || !strcmp(nptr, "n") || !strcmp(nptr, "f")) {
if (nptr)
@@ -146,7 +146,13 @@ void texlive_gs_init(void)
strcpy(tlgslibdir, tlgsbindir);
strcat(tlgslibdir, "/lib;");
strcat(tlgslibdir, tlgsbindir);
- strcat(tlgslibdir, "/fonts");
+ strcat(tlgslibdir, "/fonts;");
+ strcat(tlgslibdir, tlgsbindir);
+ strcat(tlgslibdir, "/Resource/Init;");
+ strcat(tlgslibdir, tlgsbindir);
+ strcat(tlgslibdir, "/Resource;");
+ strcat(tlgslibdir, tlgsbindir);
+ strcat(tlgslibdir, "/kanji");
strcat(tlgsbindir, "/bin;");
free(nptr);
for(nptr = tlgsbindir; *nptr; nptr++) {