diff options
author | Karl Berry <karl@freefriends.org> | 2014-04-21 18:36:53 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2014-04-21 18:36:53 +0000 |
commit | 3c9c2c050c2ec0cb4425d36e2338e1d90139a191 (patch) | |
tree | 8fc3b6fb723766f9a43a5d28cda72f740b0d1e92 | |
parent | 065e80710498a022261b584e6eab730ee492c315 (diff) |
dependencies changed; sync
git-svn-id: svn://tug.org/texlive/trunk@33596 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Build/source/texk/kpathsea/Makefile.in | 4 | ||||
-rwxr-xr-x | Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in index 8bc0d16ceec..a17e5f6eefa 100644 --- a/Build/source/texk/kpathsea/Makefile.in +++ b/Build/source/texk/kpathsea/Makefile.in @@ -109,8 +109,8 @@ EXTRA_PROGRAMS = progname-test$(EXEEXT) xdirtest$(EXEEXT) DIST_COMMON = $(top_srcdir)/../../am/bin_links.am \ $(srcdir)/../../am/rebuild.am $(srcdir)/Makefile.in \ $(srcdir)/Makefile.am $(top_srcdir)/configure \ - $(am__configure_deps) $(srcdir)/c-auto.in strstr.c putenv.c \ - strtol.c strcasecmp.c $(dist_noinst_SCRIPTS) \ + $(am__configure_deps) $(srcdir)/c-auto.in putenv.c strtol.c \ + strstr.c strcasecmp.c $(dist_noinst_SCRIPTS) \ $(dist_web2c_SCRIPTS) $(top_srcdir)/../../build-aux/depcomp \ $(dist_noinst_DATA) $(dist_web2c_DATA) $(kpseinclude_HEADERS) \ $(noinst_HEADERS) $(top_srcdir)/../../build-aux/test-driver \ diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl index ce1935042e0..43e90f0f0df 100755 --- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl +++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl @@ -1,12 +1,12 @@ #!/usr/bin/env perl -# $Id: tlmgr.pl 33571 2014-04-21 00:17:48Z karl $ +# $Id: tlmgr.pl 33590 2014-04-21 17:28:32Z karl $ # # Copyright 2008-2014 Norbert Preining # This file is licensed under the GNU General Public License version 2 # or any later version. -my $svnrev = '$Revision: 33571 $'; -my $datrev = '$Date: 2014-04-21 02:17:48 +0200 (Mon, 21 Apr 2014) $'; +my $svnrev = '$Revision: 33590 $'; +my $datrev = '$Date: 2014-04-21 19:28:32 +0200 (Mon, 21 Apr 2014) $'; my $tlmgrrevision; my $prg; if ($svnrev =~ m/: ([0-9]+) /) { @@ -112,7 +112,7 @@ our $FLAG_INSTALL = "i"; our $FLAG_REINSTALL = "I"; # keep in sync with install-tl. -our $common_fmtutil_args = \ +our $common_fmtutil_args = "--no-error-if-no-engine=$TeXLive::TLConfig::PartialEngineSupport"; # option variables @@ -5069,8 +5069,8 @@ sub check_file { if (-r $f) { return 1; } else { - # not -r, so check for the extensions .bat and .exe on w32 and cygwin - if (($a eq "win32") || ($a eq "i386-cygwin")) { + # not -r, so check for the extensions .bat and .exe on windoze-ish. + if ($a =~ /win[0-9]|.*-cygwin/) { if (-r "$f.exe" || -r "$f.bat") { return 1; } @@ -6716,7 +6716,7 @@ instead of only the current user. All three options are on by default. =item B<paper [a4|letter]> -=item B<S<[xdvi|pdftex|dvips|dvipdfmx|dvipdfm|context] paper [I<papersize>|--list]>> +=item B<S<[xdvi|pdftex|dvips|dvipdfmx|context|psutils] paper [I<papersize>|--list]>> =back |