diff options
author | Karl Berry <karl@freefriends.org> | 2019-02-19 22:23:52 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2019-02-19 22:23:52 +0000 |
commit | 197fbea9e34baff3e1ddcb1027546da93b40180d (patch) | |
tree | 80e47ec846df5a716b94e9f50c449b6887a9a1f0 /Build/source/texk | |
parent | b6d09658cf05a62a303cf3a1bf5876c6e48a2e08 (diff) |
mingw64 from luigi
git-svn-id: svn://tug.org/texlive/trunk@50065 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
-rwxr-xr-x | Build/source/texk/chktex/configure | 6 | ||||
-rwxr-xr-x | Build/source/texk/psutils/configure | 6 | ||||
-rwxr-xr-x | Build/source/texk/tex4htk/configure | 6 | ||||
-rwxr-xr-x | Build/source/texk/texlive/configure | 6 | ||||
-rw-r--r-- | Build/source/texk/web2c/Makefile.in | 37 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/luatex.am | 16 |
7 files changed, 65 insertions, 16 deletions
diff --git a/Build/source/texk/chktex/configure b/Build/source/texk/chktex/configure index 3dc361addec..279a4708a3c 100755 --- a/Build/source/texk/chktex/configure +++ b/Build/source/texk/chktex/configure @@ -13773,7 +13773,11 @@ fi $as_echo "$kpse_cv_have_win64" >&6; } case $kpse_cv_have_win64 in #( yes) : - WIN_WRAPPER=w64_wrapper ;; #( + if test "x$kpse_cv_have_win32=xmingw"; then : + WIN_WRAPPER=w64_mingw_wrapper +else + WIN_WRAPPER=w64_wrapper +fi ;; #( *) : WIN_WRAPPER=w32_wrapper ;; esac diff --git a/Build/source/texk/psutils/configure b/Build/source/texk/psutils/configure index a973f65845c..c5a5fc17687 100755 --- a/Build/source/texk/psutils/configure +++ b/Build/source/texk/psutils/configure @@ -15072,7 +15072,11 @@ fi $as_echo "$kpse_cv_have_win64" >&6; } case $kpse_cv_have_win64 in #( yes) : - WIN_WRAPPER=w64_wrapper ;; #( + if test "x$kpse_cv_have_win32=xmingw"; then : + WIN_WRAPPER=w64_mingw_wrapper +else + WIN_WRAPPER=w64_wrapper +fi ;; #( *) : WIN_WRAPPER=w32_wrapper ;; esac diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure index a971b290db8..55b660606e6 100755 --- a/Build/source/texk/tex4htk/configure +++ b/Build/source/texk/tex4htk/configure @@ -15235,7 +15235,11 @@ fi $as_echo "$kpse_cv_have_win64" >&6; } case $kpse_cv_have_win64 in #( yes) : - WIN_WRAPPER=w64_wrapper ;; #( + if test "x$kpse_cv_have_win32=xmingw"; then : + WIN_WRAPPER=w64_mingw_wrapper +else + WIN_WRAPPER=w64_wrapper +fi ;; #( *) : WIN_WRAPPER=w32_wrapper ;; esac diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure index 1877ced5d5d..8c4b670f02e 100755 --- a/Build/source/texk/texlive/configure +++ b/Build/source/texk/texlive/configure @@ -3624,7 +3624,11 @@ fi $as_echo "$kpse_cv_have_win64" >&6; } case $kpse_cv_have_win64 in #( yes) : - WIN_WRAPPER=w64_wrapper ;; #( + if test "x$kpse_cv_have_win32=xmingw"; then : + WIN_WRAPPER=w64_mingw_wrapper +else + WIN_WRAPPER=w64_wrapper +fi ;; #( *) : WIN_WRAPPER=w32_wrapper ;; esac diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in index 7a7e5b81130..b3a8e3aea20 100644 --- a/Build/source/texk/web2c/Makefile.in +++ b/Build/source/texk/web2c/Makefile.in @@ -18718,18 +18718,31 @@ $(luajittex_OBJECTS): libluajittex.a .PHONY: install-luatex-links uninstall-luatex-links .PHONY: install-luajittex-links uninstall-luajittex-links -@WIN32_TRUE@install-luatex-links: call_luatex$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT) -@WIN32_TRUE@uninstall-luatex-links: -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT) -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT) -@WIN32_TRUE@install-luajittex-links: call_luajittex$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT) -@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) -@WIN32_TRUE@uninstall-luajittex-links: -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) -@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) + +@MINGW32_TRUE@@WIN32_TRUE@install-luatex-links: .libs/luatex$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@uninstall-luatex-links: +@MINGW32_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@install-luajittex-links: .libs/luajittex$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@uninstall-luajittex-links: +@MINGW32_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) +@MINGW32_TRUE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@install-luatex-links: call_luatex$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@uninstall-luatex-links: +@MINGW32_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@install-luajittex-links: call_luajittex$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ $(INSTALL_PROGRAM) call_luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@uninstall-luajittex-links: +@MINGW32_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) +@MINGW32_FALSE@@WIN32_TRUE@ rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) luatexdir/luatex.log luatexdir/luaimage.log: luatex$(EXEEXT) luatexdir/luajittex.log luatexdir/luajitimage.log: luajittex$(EXEEXT) $(xetex_OBJECTS): $(xetex_prereq) diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index 62d4ab0491f..b5d13759fe3 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,3 +1,7 @@ +2019-02-19 Luigi Scarso <luigi.scarso@gmail.com> + * am/luatex.am ([un]install-lua[jit]tex-links) [MINGW32]: + different commands for mingw. + 2018-08-27 Luigi Scarso <luigi.scarso@gmail.com> * dropped dependency from gmp and mpfr diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am index 9d289ab00c6..0bf46639091 100644 --- a/Build/source/texk/web2c/luatexdir/am/luatex.am +++ b/Build/source/texk/web2c/luatexdir/am/luatex.am @@ -112,7 +112,22 @@ call_luajittex_LDADD = .PHONY: install-luatex-links uninstall-luatex-links .PHONY: install-luajittex-links uninstall-luajittex-links + if WIN32 +if MINGW32 +install-luatex-links: .libs/luatex$(EXEEXT) + $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) + $(INSTALL_PROGRAM) .libs/luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT) +uninstall-luatex-links: + rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT) +install-luajittex-links: .libs/luajittex$(EXEEXT) + $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajit$(EXEEXT) + $(INSTALL_PROGRAM) .libs/luajittex$(EXEEXT) $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +uninstall-luajittex-links: + rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +else !MINGW32 install-luatex-links: call_luatex$(EXEEXT) $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texlua$(EXEEXT) $(INSTALL_PROGRAM) call_luatex$(EXEEXT) $(DESTDIR)$(bindir)/texluac$(EXEEXT) @@ -125,6 +140,7 @@ install-luajittex-links: call_luajittex$(EXEEXT) uninstall-luajittex-links: rm -f $(DESTDIR)$(bindir)/texluajit$(EXEEXT) rm -f $(DESTDIR)$(bindir)/texluajitc$(EXEEXT) +endif !MINGW32 endif WIN32 # LuaTeX/LuaJITTeX Tests |