summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2014-05-16 05:25:02 +0000
committerNorbert Preining <preining@logic.at>2014-05-16 05:25:02 +0000
commitc498c9b8f5a47cd3edccde95bdc9b83545ed4247 (patch)
tree6dc179ebd1996789aa22df1b70c10bd7bc033887 /Master
parent7300d169619525a2c4591b8f93f6da61cc7593f5 (diff)
dvipdfm removal, no need to create dirs
git-svn-id: svn://tug.org/texlive/trunk@34057 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl4
-rw-r--r--Master/tlpkg/TeXLive/TLPaper.pm5
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm2
3 files changed, 5 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 9e18a3b1b20..e4d2740459e 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1747,7 +1747,6 @@ sub import_settings_from_old_tlpdb {
}
my $pdftex_paper = TeXLive::TLPaper::get_paper("pdftex");
my $dvips_paper = TeXLive::TLPaper::get_paper("dvips");
- my $dvipdfm_paper = TeXLive::TLPaper::get_paper("dvipdfm");
my $dvipdfmx_paper = TeXLive::TLPaper::get_paper("dvipdfmx");
my $context_paper;
if (defined($previoustlpdb->get_package("context"))) {
@@ -1767,9 +1766,6 @@ sub import_settings_from_old_tlpdb {
($common_paper ne $dvips_paper ? "no-agree-on-paper" : $common_paper)
if (defined($dvips_paper));
$common_paper =
- ($common_paper ne $dvipdfm_paper ? "no-agree-on-paper" : $common_paper)
- if (defined($dvipdfm_paper));
- $common_paper =
($common_paper ne $dvipdfmx_paper ? "no-agree-on-paper" : $common_paper)
if (defined($dvipdfmx_paper));
if ($common_paper eq "no-agree-on-paper") {
diff --git a/Master/tlpkg/TeXLive/TLPaper.pm b/Master/tlpkg/TeXLive/TLPaper.pm
index d2d05294405..aebe57598b5 100644
--- a/Master/tlpkg/TeXLive/TLPaper.pm
+++ b/Master/tlpkg/TeXLive/TLPaper.pm
@@ -51,12 +51,15 @@ C<TeXLive::TLPaper> -- paper size setting
use TeXLive::TLUtils qw(:DEFAULT dirname merge_into mkdirhier);
+#
+# removed the entry for dvipdfm
+# otherwise we continue generating files for dvipdfm
+# "dvipdfm" => \&paper_dvipdfm,
my %paper_sub = (
"xdvi" => \&paper_xdvi,
"pdftex" => \&paper_pdftex,
"dvips" => \&paper_dvips,
"dvipdfmx" => \&paper_dvipdfmx,
- "dvipdfm" => \&paper_dvipdfm,
"context" => \&paper_context,
"psutils" => \&paper_psutils,
);
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 9fcc0295b62..dbea8effd88 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -2688,7 +2688,7 @@ sub make_var_skeleton {
my ($prefix) = @_;
mkdirhier "$prefix/tex/generic/config";
- mkdirhier "$prefix/fonts/map/dvipdfm/updmap";
+ mkdirhier "$prefix/fonts/map/dvipdfmx/updmap";
mkdirhier "$prefix/fonts/map/dvips/updmap";
mkdirhier "$prefix/fonts/map/pdftex/updmap";
mkdirhier "$prefix/fonts/pk";