adjust tex4ht.env for %%~ now expanding to TEXMFDIST instead of SELFAUTOPARENT

git-svn-id: svn://tug.org/texlive/trunk@50283 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 140 insertions, 141 deletions

diff --git a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
index ebe4e1d799e..1cd5f7c2756 100644
--- a/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/unix/tex4ht.env
@@ -1,6 +1,6 @@
-% tex4ht.env-unix (2017-11-12-10:03), generated from tex4ht-env.tex
-% (can be used as ~/.tex4ht)
-% Copyright 2009-2017 TeX Users Group
+% unix/tex4ht.env (2019-03-07), generated from tex4ht-env.tex, and
+% modified by hand for TeX Live (unix).
+% Copyright 2009-2019 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -33,7 +33,7 @@
 %     provide the address of the file to tex4ht and t4ht throught   %
 %     the -e switch                                                 %
 %  4. Under kpathsea, the substring `%%~' may be employed in        %
-%     commands to indirectly obtain the value of ${SELFAUTOPARENT}. %
+%     commands to indirectly obtain the value of ${TEXMFDIST}.      %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % * Replace `path', and possibly what follows, with appropriate     %
@@ -41,7 +41,7 @@
 % * A path may start with:                                          %
 %   ~ for environment variable HOME                                 %
 %   ~~ for environment variable TEX4HTTFM                           %
-%   %%~ for ${SELFAUTOPARENT} of KPATHSEA                           %
+%   %%~ for ${TEXMFDIST} of KPATHSEA                                %
 % * A ! requests recursive search into subdirectories               %
 % * Multiple t and i entries are allowed                            %
 % * When supported by kpathsea                                      %
@@ -54,95 +54,95 @@
 tpath/tex/texmf/fonts/tfm/!
 %
 <default>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/1/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/mozilla/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/1/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/mozilla/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </default>
 
 <mozhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/mozilla/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/mozilla/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </mozhtf>
 
 <iso2htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/2/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/2/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso2htf>
 
 <iso5htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/5/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/5/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso5htf>
 
 <iso7htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/7/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/7/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso7htf>
 
 <iso8htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/8/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/8/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso8htf>
 
 <iso15htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/15/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/15/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso15htf>
 
 <koi8rhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/koi/8r/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/koi/8r/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </koi8rhtf>
 
 <symhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/symbol/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/symbol/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </symhtf>
 
 <win1251htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/win/1251/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/win/1251/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </win1251htf>
 
 <unihtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </unihtf>
 
 <emspkhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/html-speech/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/css/emacspeak/!
+i%%~/tex4ht/ht-fonts/html-speech/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/css/emacspeak/!
 </emspkhtf>
 
 <jsmlhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/jsml/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/jsml/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </jsmlhtf>
 
 %
@@ -226,7 +226,7 @@ S*
 %
 <javahelp>
 .html mv %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp
 .jhm echo "java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html"
 .jhm echo "--- Warning ---  Beware of leftover %%1*.html files from other compilations"
 .jhm java -jar ${HOME}/jh2.0/javahelp/bin/jhindexer.jar -db %%0-doc/%%1-jhs %%1*.html
@@ -237,42 +237,42 @@ S*
 
 <emspk>
 .html mv %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.html %%1.tmp
+.html java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.html %%1.tmp
 </emspk>
 
 <jsml>
 .jsml mv %%1.jsml %%1.tmp
-.jsml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp
+.jsml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp
 </jsml>
 
 <docbk>
 .xml cp %%1.xml %%1.tmp
-.xml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.xml %%1.tmp
+.xml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.xml %%1.tmp
 </docbk>
 
 <xhtml>
 .html mv %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp
 .xht mv %%1.xht %%1.tmp
-.xht java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp
+.xht java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp
 .xml mv %%1.xml %%1.tmp
-.xml java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp
+.xml java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp
 </xhtml>
 
 <xhtmml>
 .html mv %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp
 .xht mv %%1.xht %%1.tmp
-.xht java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp
+.xht java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp
 .xml mv %%1.xml %%1.tmp
-.xml java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp
+.xml java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp
 </xhtmml>
  
 <ooxtpipes>
 .4oo mv %%0.4oo %%0.tmp
-.4oo java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp
+.4oo java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp
 .4om mv %%1.4om %%1.tmp
-.4om java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.4om %%1.tmp
+.4om java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.4om %%1.tmp
 </ooxtpipes>
 %
 <validatehtml>
@@ -322,4 +322,3 @@ S*
 </oo>
 %
 % end of file
-
diff --git a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
index 5ad18fe389c..f64b2949658 100644
--- a/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
+++ b/Master/texmf-dist/tex4ht/base/win32/tex4ht.env
@@ -1,5 +1,6 @@
-% tex4ht.env-win32 (2017-11-12-10:03), generated from tex4ht-env.tex
-% Copyright 2009-2017 TeX Users Group
+% win32/tex4ht.env (2019-03-07), generated from tex4ht-env.tex, and
+% modified by hand for TeX Live (unix).
+% Copyright 2009-2019 TeX Users Group
 % Copyright 1997-2009 Eitan M. Gurari
 %
 % This work may be distributed and/or modified under the
@@ -32,14 +33,14 @@
 %     and t4ht.c with `#define ENVFILE xxx', or provide the address %
 %     of the file to tex4ht and t4ht throught the -e switch         %
 %  4. Under kpathsea, the substring `%%~' may be employed in        %
-%     commands to indirectly obtain the value of ${SELFAUTOPARENT}. %
+%     commands to indirectly obtain the value of ${TEXMFDIST}.      %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
 % * Fix the paths                                                   %
 % * A path may start with:                                          %
 %   ~ for environment variable HOME                                 %
 %   ~~ for environment variable TEX4HTTFM                           %
-%   %%~ for ${SELFAUTOPARENT} of KPATHSEA                           %
+%   %%~ for ${TEXMFDIST} of KPATHSEA                                %
 % * A ! requests recursive search into  subdirectories              %
 % * Multiple t and i entries are allowed                            %
 % * When supported by kpathsea                                      %
@@ -52,95 +53,95 @@
 tc:\path\tfm!
 %
 <default>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/1/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/mozilla/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/1/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/mozilla/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </default>
 
 <mozhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/mozilla/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/mozilla/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </mozhtf>
 
 <iso2htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/2/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/2/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso2htf>
 
 <iso5htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/5/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/5/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso5htf>
 
 <iso7htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/7/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/7/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso7htf>
 
 <iso8htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/8/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/8/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso8htf>
 
 <iso15htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/iso8859/15/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/iso8859/15/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </iso15htf>
 
 <koi8rhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/koi/8r/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/koi/8r/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
 </koi8rhtf>
 
 <symhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/symbol/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/symbol/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </symhtf>
 
 <win1251htf>
-i%%~/texmf-dist/tex4ht/ht-fonts/win/1251/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/win/1251/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </win1251htf>
 
 <unihtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </unihtf>
 
 <emspkhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/html-speech/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
-i%%~/texmf-dist/tex4ht/ht-fonts/css/emacspeak/!
+i%%~/tex4ht/ht-fonts/html-speech/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/css/emacspeak/!
 </emspkhtf>
 
 <jsmlhtf>
-i%%~/texmf-dist/tex4ht/ht-fonts/jsml/!
-i%%~/texmf-dist/tex4ht/ht-fonts/unicode/!
-i%%~/texmf-dist/tex4ht/ht-fonts/ascii/!
-i%%~/texmf-dist/tex4ht/ht-fonts/alias/!
+i%%~/tex4ht/ht-fonts/jsml/!
+i%%~/tex4ht/ht-fonts/unicode/!
+i%%~/tex4ht/ht-fonts/ascii/!
+i%%~/tex4ht/ht-fonts/alias/!
 </jsmlhtf>
 
 %
@@ -236,7 +237,7 @@ lc:\tex4ht\tex4ht.fls
 %
 <javahelp>
 .html move %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s javahelp.4xt -o %%1.html %%1.tmp
 .jhm java -jar c:\jh2.0\javahelp\bin\jhindexer.jar -db %%0-doc\%%1-jhs %%1*.html
 </javahelp>
 <javahelp1>
@@ -245,42 +246,42 @@ lc:\tex4ht\tex4ht.fls
 
 <emspk>
 .html move %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.html %%1.tmp
+.html java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.html %%1.tmp
 </emspk>
 
 <jsml>
 .jsml move %%1.jsml %%1.tmp
-.jsml java -classpath %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp
+.jsml java -classpath %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.jsml %%1.tmp
 </jsml>
 
 <docbk>
 .xml copy %%1.xml %%1.tmp
-.xml java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.xml %%1.tmp
+.xml java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.xml %%1.tmp
 </docbk>
 
 <xhtml>
 .html move %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.html %%1.tmp
 .xht move %%1.xht %%1.tmp
-.xht java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp
+.xht java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xht %%1.tmp
 .xml move %%1.xml %%1.tmp
-.xml java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp
+.xml java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtml.4xt -o %%1.xml %%1.tmp
 </xhtml>
 
 <xhtmml>
 .html move %%1.html %%1.tmp
-.html java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp
+.html java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.html %%1.tmp
 .xht move %%1.xht %%1.tmp
-.xht java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp
+.xht java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xht %%1.tmp
 .xml move %%1.xml %%1.tmp
-.xml java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp
+.xml java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -s xhtmml.4xt -o %%1.xml %%1.tmp
 </xhtmml>
  
 <ooxtpipes>
 .4oo move %%0.4oo %%0.tmp
-.4oo java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp
+.4oo java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%0.4oo %%0.tmp
 .4om move %%1.4om %%1.tmp
-.4om java -classpath  %%~/texmf-dist/tex4ht/bin/tex4ht.jar xtpipes -i %%~/texmf-dist/tex4ht/xtpipes/ -o %%1.4om %%1.tmp
+.4om java -classpath  %%~/tex4ht/bin/tex4ht.jar xtpipes -i %%~/tex4ht/xtpipes/ -o %%1.4om %%1.tmp
 </ooxtpipes>
 %
 <validatehtml>
@@ -362,4 +363,3 @@ lc:\tex4ht\tex4ht.fls
 </oo-msys>
 %
 % end of file
-