diff options
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/doc/tlbuild.info | 6 | ||||
-rw-r--r-- | Build/source/doc/tlbuild.texi | 6 | ||||
-rw-r--r-- | Build/source/m4/kpse-win32.m4 | 10 |
3 files changed, 11 insertions, 11 deletions
diff --git a/Build/source/doc/tlbuild.info b/Build/source/doc/tlbuild.info index 0893c7691bb..1a35c40e626 100644 --- a/Build/source/doc/tlbuild.info +++ b/Build/source/doc/tlbuild.info @@ -700,7 +700,7 @@ is made in 'BINDIR'. For example, a symlink points from 'BINDIR/ps2eps' to 'DATAROOTDIR/texmf-dist/scripts/ps2eps/ps2eps.pl'. For Windows, a standard wrapper binary (copied to, e.g., 'BINDIR/ps2eps.exe') serves the same purpose. The source for the wrapper is in -'texk/texlive/w32_wrapper'. +'texk/texlive/windows_wrapper'. One reason for this is to avoid having many copies of the same script; a more important reason is that it guarantees the scripts will @@ -1085,13 +1085,13 @@ due to the lack of symbolic links. -- Macro: KPSE_COND_WIN32_WRAP Call 'KPSE_COND_WIN32' and define the Automake conditional 'WIN32_WRAP' ('true' if the standard Windows wrapper - ('texk/texlive/w32_wrapper/runscript.exe') exists. This wrapper is + ('texk/texlive/windows_wrapper/runscript.exe') exists. This wrapper is used on Windows instead of symlinks for the "linked scripts" (*note Linked scripts::). -- Macro: KPSE_WIN32_CALL Call 'KPSE_COND_WIN32' and check if the file - 'texk/texlive/w32_wrapper/callexe.c' exists; if it does, create a + 'texk/texlive/windows_wrapper/callexe.c' exists; if it does, create a symlink in the build tree. Compiling 'callexe.c' with '-DEXEPROG='"FOO.exe"'' and installing 'callexe.exe' as 'BAR.exe' is used on Windows instead of a symlink 'BAR->FOO' for Unix-like diff --git a/Build/source/doc/tlbuild.texi b/Build/source/doc/tlbuild.texi index a4959088ded..3b4fb38c882 100644 --- a/Build/source/doc/tlbuild.texi +++ b/Build/source/doc/tlbuild.texi @@ -887,7 +887,7 @@ points from @code{@var{bindir}/ps2eps} to @code{@var{datarootdir}/texmf-dist/scripts/ps2eps/ps2eps.pl}. For Windows, a standard wrapper binary (copied to, e.g., @code{@var{bindir}/ps2eps.exe}) serves the same purpose. The source -for the wrapper is in @file{texk/texlive/w32_wrapper}. +for the wrapper is in @file{texk/texlive/windows_wrapper}. One reason for this is to avoid having many copies of the same script; a more important reason is that it guarantees the scripts will @@ -1361,7 +1361,7 @@ Call @code{KPSE_COND_WIN32} and define the Automake conditional @pindex runscript.exe Call @code{KPSE_COND_WIN32} and define the Automake conditional @code{WIN32_WRAP} (@code{true} if the standard Windows wrapper -(@file{texk/texlive/w32_wrapper/runscript.exe}) exists. This wrapper +(@file{texk/texlive/windows_wrapper/runscript.exe}) exists. This wrapper is used on Windows instead of symlinks for the ``linked scripts'' (@pxref{Linked scripts}). @end defmac @@ -1369,7 +1369,7 @@ is used on Windows instead of symlinks for the ``linked scripts'' @defmac KPSE_WIN32_CALL @pindex callexe.c Call @code{KPSE_COND_WIN32} and check if the file -@file{texk/texlive/w32_wrapper/callexe.c} exists; if it does, create a +@file{texk/texlive/windows_wrapper/callexe.c} exists; if it does, create a symlink in the build tree. Compiling @file{callexe.c} with @code{-DEXEPROG='"@var{foo}.exe"'} and installing @file{callexe.exe} as @code{@var{bar}.exe} is used on Windows instead of a symlink diff --git a/Build/source/m4/kpse-win32.m4 b/Build/source/m4/kpse-win32.m4 index cdee44e2ec7..5acba08a669 100644 --- a/Build/source/m4/kpse-win32.m4 +++ b/Build/source/m4/kpse-win32.m4 @@ -54,9 +54,9 @@ AC_CACHE_CHECK([for WIN64], [kpse_cv_have_win64=no])]) AS_CASE([$kpse_cv_have_win64], [yes], [AS_IF([test "x$kpse_cv_have_win32=xmingw"], - [WIN_WRAPPER=w64_mingw_wrapper], - [WIN_WRAPPER=w64_wrapper])], - [WIN_WRAPPER=w32_wrapper]) + [WIN_WRAPPER=windows_mingw_wrapper], + [WIN_WRAPPER=windows_wrapper])], + [WIN_WRAPPER=windows_wrapper]) AC_SUBST([WIN_WRAPPER]) AM_CONDITIONAL([WIN32_WRAP], [test -r "$srcdir/../../texk/texlive/$WIN_WRAPPER/runscript.exe"]) @@ -68,9 +68,9 @@ AM_CONDITIONAL([WIN32_WRAP], AC_DEFUN([KPSE_WIN32_CALL], [dnl AC_REQUIRE([KPSE_COND_WIN32])[]dnl AM_CONDITIONAL([WIN32_CALL], - [test -r "$srcdir/../texlive/w32_wrapper/callexe.c"]) + [test -r "$srcdir/../texlive/windows_wrapper/callexe.c"]) AM_COND_IF([WIN32], - [AC_CONFIG_LINKS([callexe.c:../texlive/w32_wrapper/callexe.c])]) + [AC_CONFIG_LINKS([callexe.c:../texlive/windows_wrapper/callexe.c])]) ]) # KPSE_WIN32_CALL # KPSE_DO_IF_WIN32(COMMAND) |