complain if the -custom-bin argument does not have kpsewhich

git-svn-id: svn://tug.org/texlive/trunk@16483 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 6 insertions, 3 deletions

diff --git a/Master/install-tl b/Master/install-tl
index 9baea198928..a38c449e659 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -405,10 +405,13 @@ info("Installing TeX Live $TeXLive::TLConfig::ReleaseYear from: $location\n");
 
 info("Platform: ", platform(), " => \'", platform_desc(platform), "\'\n");
 if ($opt_custom_bin) {
-  if (-d $opt_custom_bin) {
-    info("Platform overridden, binaries taken from $opt_custom_bin\nand put into bin/custom!\n");
+  if (-d $opt_custom_bin && (-r "$opt_custom_bin/kpsewhich"
+                             || -r "$opt_custom_bin/kpsewhich.exe")) {
+    info("Platform overridden, binaries taken from $opt_custom_bin\n"
+         . "and will be installed into .../bin/custom.\n");
   } else {
-    tldie("Argument for -custom-bin needs to be directory with TeX Live binaries!\n");
+    tldie("$opt_custom_bin: Argument to -custom-bin must be a directory "
+          . "with TeX Live binaries.\n");
   }
 }
 if ($media eq "DVD") {