5 files changed, 23 insertions, 0 deletions
diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl
index b6e5fa14423..ef6e92885d7 100755
--- a/Build/cdbuild/ctan2tds.pl
+++ b/Build/cdbuild/ctan2tds.pl
@@ -139,6 +139,7 @@ chdir $startdir || die "chdir($startdir) failed: $!";
  'ebong',	"&MAKEebong",
  'ecc',		"&MAKEecc",
  'eco',		"&MAKEeco",
+ 'edmac',	"warn \"skipping edmac, needs work (unzip xx)\n\"",
  'ednotes',	"&MAKEnosymlinks",
  'elhyphen',	"&MAKEelhyphen",
  'epiolmec',	"&MAKEflatten",
@@ -1179,6 +1180,8 @@ for (@ARGV) {
     print "Package $packagedir has a TeXlive-aware Makefile. Make and send to $DEST\n";
 
   } else {
+    &set_dir_defaults ($opt_ctan_dir);
+    
     $insrunner = $specialinsrunner{$package} || $standardinsrunner;
 
     $whichformat = $specialfmt{$package} || $standardfmt;
@@ -1198,7 +1201,27 @@ for (@ARGV) {
   &xchdir ($startdir);
 }
 
+
+# Override our default guess of "latex" if we can intuit from the CTAN
+# path, which ctan2tl kindly passes us.
+# 
+sub set_dir_defaults
+{
+  my ($ctan_dir) = @_;
+  my $changed = 1;
+  
+  if ($ctan_dir =~ m!/graphics/metapost!) {
+    $standardfmt = $standarddocfmt = $standardsourcefmt = "metapost";
+  } else {
+    $changed = 0;
+  }
+
+  print "\t reset fmt/docfmt/srcfmt to $standardfmt (based on $ctan_dir)\n"
+    if $changed;
+}
 
+
+
 sub xchdir
 {
   my ($dir) = @_;
diff --git a/Master/texmf-dist/doc/latex/makecirc/MakeCirc-en.pdf b/Master/texmf-dist/doc/metapost/makecirc/MakeCirc-en.pdf
index d96ce6367a3..d96ce6367a3 100644
--- a/Master/texmf-dist/doc/latex/makecirc/MakeCirc-en.pdf
+++ b/Master/texmf-dist/doc/metapost/makecirc/MakeCirc-en.pdf
diff --git a/Master/texmf-dist/doc/latex/makecirc/MakeCirc.pdf b/Master/texmf-dist/doc/metapost/makecirc/MakeCirc.pdf
index 812a192dc3f..812a192dc3f 100644
--- a/Master/texmf-dist/doc/latex/makecirc/MakeCirc.pdf
+++ b/Master/texmf-dist/doc/metapost/makecirc/MakeCirc.pdf
diff --git a/Master/texmf-dist/doc/latex/makecirc/README b/Master/texmf-dist/doc/metapost/makecirc/README
index 22b2d8fccb9..22b2d8fccb9 100644
--- a/Master/texmf-dist/doc/latex/makecirc/README
+++ b/Master/texmf-dist/doc/metapost/makecirc/README
diff --git a/Master/texmf-dist/doc/latex/makecirc/ejemplos.pdf b/Master/texmf-dist/doc/metapost/makecirc/ejemplos.pdf
index cf13fa545c1..cf13fa545c1 100644
--- a/Master/texmf-dist/doc/latex/makecirc/ejemplos.pdf
+++ b/Master/texmf-dist/doc/metapost/makecirc/ejemplos.pdf