diff options
Diffstat (limited to 'Build')
| -rw-r--r-- | Build/source/texk/makeindexk/ChangeLog | 6 | ||||
| -rw-r--r-- | Build/source/texk/makeindexk/Makefile.in | 2 | ||||
| -rw-r--r-- | Build/source/texk/makeindexk/c-auto.in | 3 | ||||
| -rwxr-xr-x | Build/source/texk/makeindexk/configure | 5 | ||||
| -rw-r--r-- | Build/source/texk/makeindexk/configure.ac | 4 | ||||
| -rw-r--r-- | Build/source/texk/makeindexk/makeindex.1 | 32 | ||||
| -rw-r--r-- | Build/source/texk/makeindexk/mkind.h | 2 |
7 files changed, 36 insertions, 18 deletions
diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog index eb71b2e53bb..29ddffb4d2d 100644 --- a/Build/source/texk/makeindexk/ChangeLog +++ b/Build/source/texk/makeindexk/ChangeLog @@ -1,3 +1,9 @@ +2010-07-06 Peter Breitenlohner <peb@mppmu.mpg.de> + + * configure.ac [TEX_LIVE_VERSION]: From ../../version.ac. + * mkind.h: Use TEX_LIVE_VERSION. + * makeindex.1: Formatting. + 2010-03-09 Peter Breitenlohner <peb@mppmu.mpg.de> * mkind.c: Use kpse_set_program_name() instead of diff --git a/Build/source/texk/makeindexk/Makefile.in b/Build/source/texk/makeindexk/Makefile.in index 649e0c682c5..1c0ecec12a3 100644 --- a/Build/source/texk/makeindexk/Makefile.in +++ b/Build/source/texk/makeindexk/Makefile.in @@ -59,7 +59,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ diff --git a/Build/source/texk/makeindexk/c-auto.in b/Build/source/texk/makeindexk/c-auto.in index a79c5560f6e..398b63cd013 100644 --- a/Build/source/texk/makeindexk/c-auto.in +++ b/Build/source/texk/makeindexk/c-auto.in @@ -161,6 +161,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define to the current TeX Live version string. */ +#undef TEX_LIVE_VERSION + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/Build/source/texk/makeindexk/configure b/Build/source/texk/makeindexk/configure index cc9c5024273..575ff70e6f5 100755 --- a/Build/source/texk/makeindexk/configure +++ b/Build/source/texk/makeindexk/configure @@ -11741,6 +11741,11 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags ac_config_headers="$ac_config_headers c-auto.h:c-auto.in" + + +$as_echo "#define TEX_LIVE_VERSION \"2010\"" >>confdefs.h + + for ac_header in ctype.h types.h locale.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/Build/source/texk/makeindexk/configure.ac b/Build/source/texk/makeindexk/configure.ac index 2ac0b0bd328..f8a2434dd7d 100644 --- a/Build/source/texk/makeindexk/configure.ac +++ b/Build/source/texk/makeindexk/configure.ac @@ -17,6 +17,10 @@ KPSE_COMMON([makeindexk], [no-define]) AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) +m4_include([../../version.ac])[] dnl define tex_live_version +AC_DEFINE([TEX_LIVE_VERSION], ["tex_live_version()"], + [Define to the current TeX Live version string.]) + AC_CHECK_HEADERS([ctype.h types.h locale.h]) AC_CHECK_FUNCS([strchr strrchr setlocale]) diff --git a/Build/source/texk/makeindexk/makeindex.1 b/Build/source/texk/makeindexk/makeindex.1 index 9476aebc58d..98316a65833 100644 --- a/Build/source/texk/makeindexk/makeindex.1 +++ b/Build/source/texk/makeindexk/makeindex.1 @@ -6,29 +6,29 @@ .if t .ds Uc \fIU\\h'-0.12m'C\\v'0.27m'\\h'-.23m'S\\h'-0.11m'F\\v'-0.27m'\fP .if n .ds Uc UCSF .ds Et \\f(boE\\h'-0.1667m'\\v'-0.20v'T\\v'0.20v'\\h'-0.125m'T\\fP -.TH MAKEINDEX 1L "10 December 1991" +.TH MAKEINDEX 1 "6 July 2010" "TeX Live" "TeX Live" .\"===================================================================== .SH NAME makeindex \- a general purpose, formatter-independent index processor .SH SYNOPSIS .B makeindex -.BR [ \-c ] -.BR [ \-g ] -.BR [ \-i ] -.BR [ \-l ] -.BR [ \-o +.RB [ \-c ] +.RB [ \-g ] +.RB [ \-i ] +.RB [ \-l ] +.RB [ \-o .IR ind ] -.BR [ \-p +.RB [ \-p .IR num ] -.BR [ \-q ] -.BR [ \-r ] -.BR [ \-s +.RB [ \-q ] +.RB [ \-r ] +.RB [ \-s .IR sfile ] -.BR [ \-t +.RB [ \-t .IR log ] -.BR [ \-L ] -.BR [ \-T ] -.BI [ idx0 +.RB [ \-L ] +.RB [ \-T ] +.RI [ idx0 .I idx1 .IR idx2 .\|.\|.] .\"===================================================================== @@ -183,14 +183,14 @@ using explicit range operators; see \s-2SPECIAL EFFECTS\s+2 below. By default, three or more successive pages are automatically abbreviated as a range (e.g. 1\(em5). .TP 10 -.BR \-s " sty" +.BI \-s " sty" Employ .I sty as the style file (no default). The environment variable \s-2INDEXSTYLE\s+2 defines the path where the style file should be found. .TP 10 -.BR \-t " log" +.BI \-t " log" Employ .I log as the transcript file. By default, the file name is diff --git a/Build/source/texk/makeindexk/mkind.h b/Build/source/texk/makeindexk/mkind.h index d8e331073d8..9c2b6848f8c 100644 --- a/Build/source/texk/makeindexk/mkind.h +++ b/Build/source/texk/makeindexk/mkind.h @@ -349,7 +349,7 @@ ensuing. /*====================================================================*/ #if USE_KPATHSEA -#define VERSION "version 2.15 [TeX Live 2009] (kpathsea + Thai support)" +#define VERSION "version 2.15 [TeX Live " TEX_LIVE_VERSION "] (kpathsea + Thai support)" #else #define VERSION "version 2.15 [20-Nov-2007] (with Thai support)" #endif |