diff options
| author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2008-07-13 18:17:02 +0000 |
|---|---|---|
| committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2008-07-13 18:17:02 +0000 |
| commit | 33d05dacb5209e0ffeba7418da72dc87c33ee7ce (patch) | |
| tree | 966554188cc4ac7c32e7e34b54de7ca678a0bc9d /Master | |
| parent | 430c0abe00a662ba9e6577a7e77a04b2d41e9996 (diff) | |
finishing job for texdoc.cnf
git-svn-id: svn://tug.org/texlive/trunk@9524 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/texmf/scripts/texlive/texdoc.tlu | 6 | ||||
| -rw-r--r-- | Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Master/texmf/scripts/texlive/texdoc.tlu b/Master/texmf/scripts/texlive/texdoc.tlu index bbb18bc15ce..1b4431d63d4 100755 --- a/Master/texmf/scripts/texlive/texdoc.tlu +++ b/Master/texmf/scripts/texlive/texdoc.tlu @@ -259,20 +259,22 @@ end -- read all config files. function setup_config () - local TEXMFHOME, TEXMFLOCAL + local TEXMFHOME, TEXMFLOCAL, TEXMFMAIN local platform, configfile, configfiles local ext, command, default_viewer -- platform=string.match(kpse.var_value('SELFAUTOLOC'), '.*/(.*)$') TEXMFHOME=kpse.var_value('TEXMFHOME') TEXMFLOCAL=kpse.var_value('TEXMFLOCAL') + TEXMFMAIN=kpse.var_value('TEXMFMAIN') -- -- the following config files are read if they exist. configfiles={ TEXMFHOME ..'/texdoc/texdoc-'..platform..'.cnf', TEXMFHOME ..'/texdoc/texdoc.cnf', TEXMFLOCAL..'/texdoc/texdoc-'..platform..'.cnf', - TEXMFLOCAL..'/texdoc/texdoc.cnf' + TEXMFLOCAL..'/texdoc/texdoc.cnf', + TEXMFMAIN..'/texdoc/texdoc.cnf' } -- for i, configfile in ipairs(configfiles) do -- process all config files diff --git a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc index 580470abba4..6ffa2054a4a 100644 --- a/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc +++ b/Master/tlpkg/tlpsrc/bin-texdoc.tlpsrc @@ -4,6 +4,7 @@ depend bin-kpathsea runpattern f texmf/scripts/tetex/texdoctk.pl runpattern f texmf/scripts/texlive/texdoc.tlu runpattern f texmf/texdoctk/* +runpattern f texmf/texdoc/* docpattern f texmf/doc/man/man1/texdoc.1 docpattern f texmf/doc/man/man1/texdoctk.1 binpattern f bin/${ARCH}/texdoc |