[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: SVN tetex-bin commit: r1796 - in tetex-bin/trunk/debian: . patches



Hi all!

Help with search path magic.

Ok, I did the following for texlive, and want to know what you think
aobut:

I changed the texmf.in (which matches with the texmf.in.teTeX in tetex)
to include the correct pathes, and changed the sed magic in the
Makefile.in. Here is the patch:
--- ./build/TeX/texk/kpathsea/Makefile.in.orig	2006-10-16 17:33:21.000000000 +0200
+++ ./build/TeX/texk/kpathsea/Makefile.in	2006-10-16 17:33:45.000000000 +0200
@@ -127,11 +127,6 @@
 	| sed '/^$$/d' \
 	| sed 's/^\([^ 	=]*\)[ 	]*=*[ 	]*\(.*\)/#ifndef DEFAULT_\1%#define DEFAULT_\1 "\2"%#endif/' \
 	| tr '%' '\012' \
-	| sed -e 's%\$$TEXMFMAIN%$(texmf)%g' \
-	      -e 's%\$$TEXMF%$(texmf)%g' \
-	      -e 's%\$$VARTEXFONTS%$(vartexfonts)%g' \
-	      -e 's%\$$web2cdir%$(web2cdir)%g' \
-	      -e 's%\$$prefix%$(prefix)%g' \
 	| sed -e 's%;%:%g' \
 	>>paths.tmp
 	@if cmp -s paths.h paths.tmp 2>/dev/null; then \
--- ./build/TeX/texk/kpathsea/texmf.in.orig	2006-10-16 16:21:26.000000000 +0200
+++ ./build/TeX/texk/kpathsea/texmf.in	2006-10-16 17:34:08.000000000 +0200
@@ -56,15 +56,15 @@
 
 % The tree containing the runtime files closely related to the specific
 % program version used:
-TEXMFMAIN = @texmf@
+TEXMFMAIN = /usr/share/texmf
 
 % The main distribution tree:
-TEXMFDIST = @texmf@-dist
+TEXMFDIST = /usr/share/texmf-texlive
 
 % A place for local additions to a "standard" texmf tree.
 % This tree is not used for local configuration maintained by
 % texconfig, it uses TEXMFCONFIG below.
-TEXMFLOCAL = @texmf@-local
+TEXMFLOCAL = /usr/local/share/texmf
 
 % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
 % With teTeX-3.0 or later, this must be set.
@@ -72,7 +72,7 @@
 %   TEXMFSYSVAR = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFSYSVAR = @texmf@-var
-TEXMFSYSVAR = @texmf@-var
+TEXMFSYSVAR = /var/lib/texmf
 
 % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
 % With teTeX-3.0 or later, this must be set.
@@ -80,7 +80,7 @@
 %   TEXMFSYSCONFIG = $TEXMFMAIN
 % For using a separate tree:
 %   TEXMFSYSCONFIG = @texmf@-config
-TEXMFSYSCONFIG = @texmf@-config
+TEXMFSYSCONFIG = /etc/texmf
 
 % User texmf trees can be catered for like this...
 % This used to be HOMETEXMF.
@@ -119,7 +119,7 @@
 % Where generated fonts may be written.  This tree is used when the sources
 % were found in a system tree and either that tree wasn't writable, or the
 % varfonts feature was enabled in MT_FEATURES in mktex.cnf.
-VARTEXFONTS = @vartexfonts@
+VARTEXFONTS = /var/cache/fonts
 
 % Where to look for ls-R files.  There need not be an ls-R in the
 % directories in this path, but if there is one, Kpathsea will use it.
@@ -382,7 +382,7 @@
 %
 % For security reasons, it is better not to have . part of the path.
 % 
-TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};$TETEXDIR;$TEXMF/web2c;@web2c@
+TEXMFCNF = /usr/share/texmf/web2c;/usr/share/texmf-texlive/web2c;/usr/local/share/texmf/web2c
 
 # $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To
 # avoid empty expansions from binaries linked against an earlier


After this my kpsewhich spits out:

$ kpsewhich -debug=-1 -show-path .cnf
kdebug:Search path for cnf files (from compile-time paths.h)
kdebug:  = /usr/share/texmf/web2c:/usr/share/texmf-texlive/web2c:/usr/local/share/texmf/web2c
...
kdebug:start search(file=texmf.cnf, must_exist=1, find_all=1, path=/usr/share/texmf/web2c:/usr/share/texmf-texlive/web2c:/usr/local/share/texmf/web2c).
...
/usr/share/texmf/web2c:/usr/share/texmf-texlive/web2c:/usr/local/share/texmf/web2c
$

which seems to be ok. Other pathes still show all the stuff as defined
in texmf.cnf.

Is there any objection from any side in the sense that this could break
something?

Best wishes

Norbert

-------------------------------------------------------------------------------
Dr. Norbert Preining <preining@logic.at>                    Università di Siena
Debian Developer <preining@debian.org>                         Debian TeX Group
gpg DSA: 0x09C5B094      fp: 14DF 2E6C 0307 BE6D AD76  A9C0 D2BF 4AA3 09C5 B094
-------------------------------------------------------------------------------
ADLESTROP (n.)
That part of a suitcase which is designed to get snarled up on
conveyor belts at airports. Some of the more modern adlestrop designs
have a special 'quick release' feature which enables the case to flip
open at this point and fling your underclothes into the conveyor
belt's gearing mechanism.
			--- Douglas Adams, The Meaning of Liff



Reply to: