summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-01-06 20:53:35 +0000
committerAkira Kakuto <kakuto@fuk.kindai.ac.jp>2019-01-06 20:53:35 +0000
commitbee0d2fefd913952b342b909a4a278ce72712e51 (patch)
tree04b2258cb937501da958a42b3e37e159bd748d94 /Build
parent522dfa21dfa73176aedd7412314b510564144cfc (diff)
add missing changes to have correct engine name
git-svn-id: svn://tug.org/texlive/trunk@49616 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/web2c/mplibdir/mpost.w9
-rw-r--r--Build/source/texk/web2c/pmpostdir/pmpost.ch16
2 files changed, 21 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/mplibdir/mpost.w b/Build/source/texk/web2c/mplibdir/mpost.w
index 0ce57955e88..3cf35eedb1d 100644
--- a/Build/source/texk/web2c/mplibdir/mpost.w
+++ b/Build/source/texk/web2c/mplibdir/mpost.w
@@ -1386,9 +1386,12 @@ main (int argc, char **argv)
options->print_found_names = (int)true;
{
const char *base = cleaned_invocation_name(argv[0]);
- if (FILESTRCASEEQ(base, "rmpost")||FILESTRCASEEQ(base, "r-mpost")){
+ if (FILESTRCASEEQ(base, "rmpost")){
base++;
restricted_mode = true;
+ } else if (FILESTRCASEEQ(base, "r-mpost")){
+ base += 2;
+ restricted_mode = true;
}
if (FILESTRCASEEQ(base, "dvitomp"))
dvitomp_only=1;
@@ -1423,8 +1426,10 @@ main (int argc, char **argv)
kpse_set_program_enabled (kpse_mem_format, MAKE_TEX_FMT_BY_DEFAULT,
kpse_src_compile);
kpse_set_program_name(argv[0], user_progname);
- if (FILESTRCASEEQ(kpse_program_name, "rmpost")||FILESTRCASEEQ(kpse_program_name, "r-mpost"))
+ if (FILESTRCASEEQ(kpse_program_name, "rmpost"))
kpse_program_name++;
+ else if (FILESTRCASEEQ(kpse_program_name, "r-mpost"))
+ kpse_program_name += 2;
}
@= /*@@=nullpass@@*/ @>
if(putenv(xstrdup("engine=metapost")))
diff --git a/Build/source/texk/web2c/pmpostdir/pmpost.ch b/Build/source/texk/web2c/pmpostdir/pmpost.ch
index c679be58908..a58918998b9 100644
--- a/Build/source/texk/web2c/pmpostdir/pmpost.ch
+++ b/Build/source/texk/web2c/pmpostdir/pmpost.ch
@@ -244,12 +244,18 @@ else
@z
@x
- if (FILESTRCASEEQ(base, "rmpost")||FILESTRCASEEQ(base, "r-mpost")){
+ if (FILESTRCASEEQ(base, "rmpost")){
@y
if (FILESTRCASEEQ(base, "r"@= @>P_UP@= @>"mpost")){
@z
@x
+ } else if (FILESTRCASEEQ(base, "r-mpost")){
+@y
+ } else if (FILESTRCASEEQ(base, "r-"@= @>P_UP@= @>"mpost")){
+@z
+
+@x
if (FILESTRCASEEQ(base, "dvitomp"))
@y
if (FILESTRCASEEQ(base, P_UP@= @>"dvitomp"))
@@ -279,12 +285,18 @@ else
@z
@x
- if (FILESTRCASEEQ(kpse_program_name, "rmpost")||FILESTRCASEEQ(kpse_program_name, "r-mpost"))
+ if (FILESTRCASEEQ(kpse_program_name, "rmpost"))
@y
if (FILESTRCASEEQ(kpse_program_name, "r"@= @>P_UP@= @>"mpost"))
@z
@x
+ else if (FILESTRCASEEQ(kpse_program_name, "r-mpost"))
+@y
+ else if (FILESTRCASEEQ(kpse_program_name, "r-"@= @>P_UP@= @>"mpost"))
+@z
+
+@x
if(putenv(xstrdup("engine=metapost")))
@y
if(putenv(xstrdup("engine="@= @>P_UP@= @>"mpost")))