pdfbook2: no windows wrapper since relies on sh scripts

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

5 files changed, 10 insertions, 4 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 3f84ef1b853..f07382c7187 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -47,6 +47,8 @@ installdirs-local:
 ## 
 ## Some /bin/sh scripts are listed as `other' or `context'
 ## scripts because they are correctly handled by the wrapper binaries.
+## Conversely, some non-sh scripts are listed as `shell' because they
+## depend on shell scripts or otherwise aren't useful on Windows.
 ## 
 texmf_scriptsdir = $(datarootdir)/texmf-dist/scripts
 texmf_shell_scripts = \
@@ -59,6 +61,7 @@ texmf_shell_scripts = \
 	listings-ext/listings-ext.sh \
 	ltxfileinfo/ltxfileinfo \
 	lua2dox/lua2dox_filter \
+	pdfbook2/pdfbook2 \
 	pdfjam/pdf180 \
 	pdfjam/pdf270 \
 	pdfjam/pdf90 \
@@ -140,7 +143,6 @@ texmf_other_scripts = \
 	musixtex/musixtex.lua \
 	oberdiek/pdfatfi.pl \
 	pax/pdfannotextractor.pl \
-	pdfbook2/pdfbook2 \
 	pdfcrop/pdfcrop.pl \
 	pedigree-perl/pedigree.pl \
 	perltex/perltex.pl \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index a5650b423ac..17722f20426 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -276,6 +276,7 @@ texmf_shell_scripts = \
 	listings-ext/listings-ext.sh \
 	ltxfileinfo/ltxfileinfo \
 	lua2dox/lua2dox_filter \
+	pdfbook2/pdfbook2 \
 	pdfjam/pdf180 \
 	pdfjam/pdf270 \
 	pdfjam/pdf90 \
@@ -358,7 +359,6 @@ texmf_other_scripts = \
 	musixtex/musixtex.lua \
 	oberdiek/pdfatfi.pl \
 	pax/pdfannotextractor.pl \
-	pdfbook2/pdfbook2 \
 	pdfcrop/pdfcrop.pl \
 	pedigree-perl/pedigree.pl \
 	perltex/perltex.pl \
diff --git a/Master/bin/win32/pdfbook2.exe b/Master/bin/win32/pdfbook2.exe
deleted file mode 100755
index 5777d90a17a..00000000000
--- a/Master/bin/win32/pdfbook2.exe
+++ /dev/null
diff --git a/Master/tlpkg/bin/tlpkg-ctan-check b/Master/tlpkg/bin/tlpkg-ctan-check
index 28bac4179fc..84afb9ade3c 100755
--- a/Master/tlpkg/bin/tlpkg-ctan-check
+++ b/Master/tlpkg/bin/tlpkg-ctan-check
@@ -607,6 +607,7 @@ my @TLP_no_check = (
   "afm2pl",		# not on ctan
   "aleph",		# binary
   "asymptote",		# binary
+  "autosp",		# binary
   "bibtex",		# binary
   "bibtex8",		# binary
   "bibtexu",		# binary
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 61c63e452e5..d6eab255e83 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3415,10 +3415,13 @@ sub doscripts {
         # Windows.  If a shell script, skip.  Else copy the wrapper.
         next if $s =~ /\.sh$/ && $s !~ /-sys\.sh$/;
         #
-        # We need to change this to match texmf_dist_shell_scripts in
-        # linked_scripts/Makefile.am.
+        # Other shell scripts whose names don't end in .sh.  We need to
+        # change this to match texmf_dist_shell_scripts in
+        # linked_scripts/Makefile.am, or rather read that list.  xx
         next if $s =~ /dtx(file)?gen/;
         next if $s =~ /latexfileversion|ltxfileinfo$/;
+        next if $s =~ /pdfbook2/;
+        next if $package eq "pdfjam";
         #
         if ($s eq "lua2dox_filter") {  # handwritten .bat
           &SYSTEM ("$MV $s.bat $platdir/");