summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2007-12-24 01:05:58 +0000
committerKarl Berry <karl@freefriends.org>2007-12-24 01:05:58 +0000
commita07a133a06ff8641e8f52ccbdb0c33774d25e2b0 (patch)
tree26e406f3cc553baca514eadea571d06b7b0cfc10
parentbf57c62ac76b4e26fdd833e56e77837b2546435b (diff)
--subdir implies --all
git-svn-id: svn://tug.org/texlive/trunk@5852 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/kpsewhich.c6
-rwxr-xr-xMaster/bin/i386-linux/kpsewhichbin200133 -> 200165 bytes
2 files changed, 6 insertions, 0 deletions
diff --git a/Build/source/texk/kpathsea/kpsewhich.c b/Build/source/texk/kpathsea/kpsewhich.c
index 01dcd8a89ba..2ef873c3e6a 100644
--- a/Build/source/texk/kpathsea/kpsewhich.c
+++ b/Build/source/texk/kpathsea/kpsewhich.c
@@ -518,6 +518,12 @@ main P2C(int, argc, string *, argv)
puts (value);
}
+ /* --subdir must imply --all, since we filter here after doing the
+ search, rather than inside the search itself. */
+ if (STR_LIST_LENGTH (subdir_paths) > 0) {
+ show_all = 1;
+ }
+
for (; optind < argc; optind++) {
unfound += lookup (argv[optind]);
}
diff --git a/Master/bin/i386-linux/kpsewhich b/Master/bin/i386-linux/kpsewhich
index 5ea3b4c7b10..487b02b9055 100755
--- a/Master/bin/i386-linux/kpsewhich
+++ b/Master/bin/i386-linux/kpsewhich
Binary files differ