summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-15 22:31:17 +0000
committerKarl Berry <karl@freefriends.org>2013-04-15 22:31:17 +0000
commit9d1333555e09cdce8fbf03ca71d13315263d31af (patch)
treed3bf81c5fb0528e6662bac2186607d8fa678c13f /Master
parent49742e558ae6a2766508b2c59f24009d0d4a94b2 (diff)
tl w32 wrapper rather than context wrapper for mptopdf
git-svn-id: svn://tug.org/texlive/trunk@29958 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/bin/win32/mptopdf.exebin6144 -> 1536 bytes
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds10
2 files changed, 9 insertions, 1 deletions
diff --git a/Master/bin/win32/mptopdf.exe b/Master/bin/win32/mptopdf.exe
index 2d45f27494d..5777d90a17a 100755
--- a/Master/bin/win32/mptopdf.exe
+++ b/Master/bin/win32/mptopdf.exe
Binary files differ
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 3bbeff1622a..3355ca94251 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -5023,6 +5023,8 @@ sub build_scripts_copy {
&SYSTEM ("$CP $exec $builddir/");
# Warn if missing from the Makefile.am in the sources.
+ # (but not for mptopdf, since peb unified it.)
+ return if $exec =~ /mptopdf/;
(my $exec_basename = $exec) =~ s,^.*/,,;
my $scripts_Makefile = "$Build/$build_scriptsdir/Makefile.in";
my $pattern = "\\b$build_subdir/$exec_basename\\b";
@@ -5045,7 +5047,13 @@ sub POSTmptopdf {
my $exec = "mptopdf.pl";
&bindirs_symlink ($exec);
&build_scripts_copy ($exec, $pkg_subdir);
- &SYSTEM ("$CP ../stubs/mswin/mptopdf.exe $w32_bindir/");
+ #
+ # but for windows, use our wrapper rather than ConTeXt's,
+ # since the whole point is to have mptopdf available without ConTeXt.
+
+ my $build_tldir = "texk/texlive";
+ my $w32_wrapper = "$Build/$build_tldir/w32_wrapper/runscript.exe";
+ &SYSTEM ("$CP $w32_wrapper $w32_bindir/mptopdf.exe");
#
print "still POST$package - man page\n";
&xchdir ("$DEST/doc/context/scripts/mkii");