summaryrefslogtreecommitdiff
path: root/Build/source/texk/makeindexk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-09-30 08:41:47 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-09-30 08:41:47 +0000
commitcb61b231c4bac57c4860db0c86c88cc876ae82b0 (patch)
treedf50561b09d2eb9e019b6eeed298f0c32052dbc8 /Build/source/texk/makeindexk
parent033973b0e37edd88275b01dec0409ba81352f5a0 (diff)
makeindex: bug fix - pass correct arg to kpse_set_program_name()
git-svn-id: svn://tug.org/texlive/trunk@24153 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/makeindexk')
-rw-r--r--Build/source/texk/makeindexk/ChangeLog5
-rw-r--r--Build/source/texk/makeindexk/Makefile.am2
-rw-r--r--Build/source/texk/makeindexk/Makefile.in2
-rw-r--r--Build/source/texk/makeindexk/mkind.c9
-rwxr-xr-xBuild/source/texk/makeindexk/tests/nested-range-test.pl4
5 files changed, 13 insertions, 9 deletions
diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog
index 00d9a3864ad..bf7c2c6a1c9 100644
--- a/Build/source/texk/makeindexk/ChangeLog
+++ b/Build/source/texk/makeindexk/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-30 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * mkind.c (main): The argument of kpse_set_program_name() must
+ be the unmodified argv[0], not basename(argv[0]) or some such.
+
2011-09-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* genind.c: write a binary string by octal numbers to avoid an
diff --git a/Build/source/texk/makeindexk/Makefile.am b/Build/source/texk/makeindexk/Makefile.am
index 9c8082ce003..04767149ab0 100644
--- a/Build/source/texk/makeindexk/Makefile.am
+++ b/Build/source/texk/makeindexk/Makefile.am
@@ -46,5 +46,5 @@ EXTRA_DIST += $(TESTS)
## tests/nested-range-test.pl
EXTRA_DIST += tests/nested-range.tex tests/nested-range.idx \
tests/nested-range-bb.tex tests/nested-range-bb.idx
-DISTCLEANFILES =
+DISTCLEANFILES = nested-range.ilg nested-range.ind
diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in
index b993fc40e92..253db5c7239 100644
--- a/Build/source/texk/makeindexk/Makefile.in
+++ b/Build/source/texk/makeindexk/Makefile.in
@@ -278,7 +278,7 @@ EXTRA_DIST = CONTRIB NOTES $(TESTS) tests/nested-range.tex \
tests/nested-range.idx tests/nested-range-bb.tex \
tests/nested-range-bb.idx
TESTS = tests/nested-range-test.pl
-DISTCLEANFILES =
+DISTCLEANFILES = nested-range.ilg nested-range.ind
all: c-auto.h
$(MAKE) $(AM_MAKEFLAGS) all-am
diff --git a/Build/source/texk/makeindexk/mkind.c b/Build/source/texk/makeindexk/mkind.c
index a295024dcdf..2373671eff3 100644
--- a/Build/source/texk/makeindexk/mkind.c
+++ b/Build/source/texk/makeindexk/mkind.c
@@ -105,6 +105,10 @@ main(int argc, char *argv[])
int ilg_given = FALSE;
int log_given = FALSE;
+#if USE_KPATHSEA
+ kpse_set_program_name (*argv, NULL);
+#endif
+
/* determine program name */
pgm_fn = strrchr(*argv, DIR_DELIM);
#ifdef ALT_DIR_DELIM
@@ -120,11 +124,6 @@ main(int argc, char *argv[])
else
pgm_fn++;
-#if USE_KPATHSEA
- kpse_set_program_name (pgm_fn, NULL); /* use the same name as the intro message */
-#endif
-
-
/* process command line options */
while (--argc > 0) {
if (**++argv == SW_PREFIX) {
diff --git a/Build/source/texk/makeindexk/tests/nested-range-test.pl b/Build/source/texk/makeindexk/tests/nested-range-test.pl
index 04d17d29d2c..441328257d6 100755
--- a/Build/source/texk/makeindexk/tests/nested-range-test.pl
+++ b/Build/source/texk/makeindexk/tests/nested-range-test.pl
@@ -11,7 +11,7 @@ require "$srcdir/../tests/common-test.pl";
exit (&main ());
sub main {
- my $ret = &test_run ("makeindex", "$srcdir/tests/nested-range.idx",
+ my $ret = &test_run ("./makeindex", "$srcdir/tests/nested-range.idx",
"-o", "nested-range.ind",
"-t", "nested-range.ilg");
@@ -21,7 +21,7 @@ sub main {
$IND = "nested-range.ind";
open (IND) || die "open($IND) failed: $!";
while (<IND>) {
- $bad = 77 if /\\\(/;
+ $bad = 1 if /\\\(/;
}
close (IND) || die "close($IND) failed: $!";