1 diff -up texlive/texk/make/paths.mk.fedora_paths texlive/texk/make/paths.mk
2 --- texlive/texk/make/paths.mk.fedora_paths 2007-08-19 08:46:09.000000000 +0200
3 +++ texlive/texk/make/paths.mk 2007-08-19 08:55:17.000000000 +0200
4 @@ -59,7 +59,7 @@ libexecdir = @libexecdir@
7 # The directory used by varfonts.
8 -vartexfonts = /var/tmp/texfonts
9 +vartexfonts = $(localstatedir)/cache/fonts
11 # Regular input files.
12 texinputdir = $(texmf)/tex
13 diff -up texlive/texk/kpathsea/texmf.in.fedora_paths texlive/texk/kpathsea/texmf.in
14 --- texlive/texk/kpathsea/texmf.in.fedora_paths 2007-08-19 08:47:04.000000000 +0200
15 +++ texlive/texk/kpathsea/texmf.in 2007-08-21 14:16:49.000000000 +0200
19 % The main distribution tree:
20 -TEXMFDIST = @texmf@-dist
23 % A place for local additions to a "standard" texmf tree.
24 % This tree is not used for local configuration maintained by
25 % texconfig, it uses TEXMFCONFIG below.
26 -TEXMFLOCAL = @texmf@-local
27 +TEXMFLOCAL = /usr/local/share/texmf
29 % TEXMFSYSVAR, where texconfig-sys stores variable runtime data.
30 % With teTeX-3.0 or later, this must be set.
31 @@ -72,7 +72,7 @@ TEXMFLOCAL = @texmf@-local
32 % TEXMFSYSVAR = $TEXMFMAIN
33 % For using a separate tree:
34 % TEXMFSYSVAR = @texmf@-var
35 -TEXMFSYSVAR = @texmf@-var
36 +TEXMFSYSVAR = @localstatedir@/lib/texmf
38 % TEXMFSYSCONFIG, where texconfig-sys stores configuration data.
39 % With teTeX-3.0 or later, this must be set.
40 @@ -80,7 +80,7 @@ TEXMFSYSVAR = @texmf@-var
41 % TEXMFSYSCONFIG = $TEXMFMAIN
42 % For using a separate tree:
43 % TEXMFSYSCONFIG = @texmf@-config
44 -TEXMFSYSCONFIG = @texmf@-config
45 +TEXMFSYSCONFIG = @sysconfdir@/texmf
47 % User texmf trees are allowed as follows.
48 % This used to be HOMETEXMF.
49 @@ -111,7 +111,7 @@ TEXMFCONFIG = $HOME/.texmf-config
51 % For texconfig to work properly, TEXMFCONFIG and TEXMFVAR should be named
52 % explicitly and before all other trees.
53 -TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,!!$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFMAIN,!!$TEXMFLOCAL,!!$TEXMFDIST}
54 +TEXMF = {$TEXMFCONFIG,$TEXMFVAR,$TEXMFHOME,$TEXMFSYSCONFIG,!!$TEXMFSYSVAR,!!$TEXMFLOCAL,!!$TEXMFMAIN,!!$TEXMFDIST}
56 % The system trees. These are the trees that are shared by all the users.
57 % If a tree appears in this list, the mktex* scripts will use
58 @@ -379,7 +379,7 @@ TEXMFSCRIPTS = $TEXMF/scripts//
60 % For security reasons, it is better not to have . part of the path.
62 -TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c};/.$TETEXDIR;$TEXMF/web2c;@web2c@
63 +TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf-local/web2c};@sysconfdir@/texmf/web2c;/usr/local/share/texmf/web2c;$TEXMF/web2c;@web2c@
65 # $progname: kpathsea v. 3.5.3 or later overwrites this at runtime. To
66 # avoid empty expansions from binaries linked against an earlier