new build system: mode texk/xdvik and general update

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

7 files changed, 146 insertions, 86 deletions

diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am
index 5cdc69a7e15..407782f8d36 100644
--- a/Build/source/texk/tex4htk/Makefile.am
+++ b/Build/source/texk/tex4htk/Makefile.am
@@ -1,3 +1,7 @@
+## Makefile.am for the TeX Live subdirectory texk/tex4htk/
+##
+## Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+## You may freely use, modify and/or distribute this file.
 ##
 ACLOCAL_AMFLAGS = -I ../../m4
 
@@ -24,8 +28,14 @@ shell_scripts = ht htcontext htlatex htmex httex httexi htxelatex htxetex
 
 EXTRA_DIST = $(perl_scripts) $(shell_scripts)
 
-install-exec-hook:
-	$(mkdir_p) "$(DESTDIR)$(tex4htdir)" "$(DESTDIR)$(bindir)"
+## Make sure $(tex4htdir) exists
+##
+tex4ht_subdir = texmf-dist/scripts/tex4ht
+tex4htdir = ${prefix}/$(tex4ht_subdir)
+tex4ht_SCRIPTS =
+
+## We support both multiplatform and non-multiplatform builds.
+install-data-hook:
 	@for p in $(perl_scripts); do \
 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.pl'"; \
 	  $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.pl"; \
@@ -34,25 +44,41 @@ install-exec-hook:
 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.sh'"; \
 	  $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \
 	done
+	case "$(bindir)" in \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+	     exit 1;; \
+	esac
+
+## Make sure $(bindir) exists
+##
+bin_SCRIPTS =
+
+## Link to the basename, removing the extension,
+.PHONY: install-links
+install-links:
 	@cd $(DESTDIR)$(bindir) && \
 	  for p in $(perl_scripts); do \
-	    echo "$(LN_S) $(tex4htrel)/$$p.pl $$p"; \
-	    rm -f $$p; $(LN_S) $(tex4htrel)/$$p.pl $$p; \
-	  done; \
+	    rm -f $$p; \
+	    echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \
+	    $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
+	  done && \
 	  for p in $(shell_scripts); do \
-	    echo "$(LN_S) $(tex4htrel)/$$p.sh $$p"; \
-	    rm -f $$p; $(LN_S) $(tex4htrel)/$$p.sh $$p; \
+	    rm -f $$p; \
+	    echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \
+	    $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
 	  done
 
 uninstall-hook:
-	@for p in $(perl_scripts) $(shell_scripts); do \
-	  echo "rm -f '$(DESTDIR)$(bindir)/$$p'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$p"; \
-	done
 	@for p in $(perl_scripts:=.pl) $(shell_scripts:=.sh); do \
 	  echo "rm -f '$(DESTDIR)$(tex4htdir)/$$p'"; \
 	  rm -f "$(DESTDIR)$(tex4htdir)/$$p"; \
 	done
+	@for p in $(perl_scripts) $(shell_scripts); do \
+	  echo "rm -f '$(DESTDIR)$(bindir)/$$p'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$p"; \
+	done
 
 ## Not used
 ##
@@ -175,7 +201,3 @@ EXTRA_DIST += \
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
-## Eventually delete these files
-##
-EXTRA_DIST += Makefile.in.orig configure.in.orig
-
diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in
index 7fd946adb9b..f56c6e38df7 100644
--- a/Build/source/texk/tex4htk/Makefile.in
+++ b/Build/source/texk/tex4htk/Makefile.in
@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -63,7 +64,8 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = c-auto.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(tex4htdir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_t4ht_OBJECTS = t4ht.$(OBJEXT)
@@ -73,6 +75,9 @@ am__DEPENDENCIES_1 =
 am_tex4ht_OBJECTS = tex4ht.$(OBJEXT)
 tex4ht_OBJECTS = $(am_tex4ht_OBJECTS)
 tex4ht_LDADD = $(LDADD)
+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+tex4htSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(bin_SCRIPTS) $(tex4ht_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -211,8 +216,6 @@ sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-tex4htdir = @tex4htdir@
-tex4htrel = @tex4htrel@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -242,8 +245,11 @@ EXTRA_DIST = $(perl_scripts) $(shell_scripts) dbcontext dblatex \
 	uxhcontext uxhlatex uxhmex uxhtex uxhtexi uxhxelatex uxhxetex \
 	wcontext wlatex wmex wtex wtexi wxelatex wxetex xhcontext \
 	xhlatex xhmcontext xhmex xhmlatex xhmmex xhmtex xhmtexi \
-	xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java \
-	Makefile.in.orig configure.in.orig
+	xhmxelatex xhmxetex xhtex xhtexi xhxelatex xhxetex xv4ht.java
+tex4ht_subdir = texmf-dist/scripts/tex4ht
+tex4htdir = ${prefix}/$(tex4ht_subdir)
+tex4ht_SCRIPTS = 
+bin_SCRIPTS = 
 all: c-auto.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
@@ -333,6 +339,44 @@ t4ht$(EXEEXT): $(t4ht_OBJECTS) $(t4ht_DEPENDENCIES)
 tex4ht$(EXEEXT): $(tex4ht_OBJECTS) $(tex4ht_DEPENDENCIES) 
 	@rm -f tex4ht$(EXEEXT)
 	$(LINK) $(tex4ht_OBJECTS) $(tex4ht_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
+	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
+install-tex4htSCRIPTS: $(tex4ht_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(tex4htdir)" || $(MKDIR_P) "$(DESTDIR)$(tex4htdir)"
+	@list='$(tex4ht_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(tex4htSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(tex4htdir)/$$f'"; \
+	    $(tex4htSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(tex4htdir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-tex4htSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(tex4ht_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(tex4htdir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(tex4htdir)/$$f"; \
+	done
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -556,9 +600,9 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS) c-auto.h
+all-am: Makefile $(PROGRAMS) $(SCRIPTS) c-auto.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(tex4htdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -606,13 +650,13 @@ info: info-am
 
 info-am:
 
-install-data-am:
+install-data-am: install-tex4htSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 
 install-dvi: install-dvi-am
 
-install-exec-am: install-binPROGRAMS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-exec-am: install-binPROGRAMS install-binSCRIPTS
 
 install-html: install-html-am
 
@@ -646,11 +690,12 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-tex4htSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 
-.MAKE: install-am install-exec-am install-strip uninstall-am
+.MAKE: install-am install-data-am install-strip uninstall-am
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic clean-libtool ctags dist \
@@ -659,21 +704,22 @@ uninstall-am: uninstall-binPROGRAMS
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-exec-hook \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-hook
+	install-binPROGRAMS install-binSCRIPTS install-data \
+	install-data-am install-data-hook install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	install-tex4htSCRIPTS installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-binSCRIPTS uninstall-hook \
+	uninstall-tex4htSCRIPTS
 
 
 @KPATHSEA_RULE@
 
-install-exec-hook:
-	$(mkdir_p) "$(DESTDIR)$(tex4htdir)" "$(DESTDIR)$(bindir)"
+install-data-hook:
 	@for p in $(perl_scripts); do \
 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.pl'"; \
 	  $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.pl"; \
@@ -682,25 +728,36 @@ install-exec-hook:
 	  echo "$(INSTALL_SCRIPT) $(srcdir)/$$p '$(DESTDIR)$(tex4htdir)/$$p.sh'"; \
 	  $(INSTALL_SCRIPT) $(srcdir)/$$p "$(DESTDIR)$(tex4htdir)/$$p.sh"; \
 	done
+	case "$(bindir)" in \
+	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+	     exit 1;; \
+	esac
+
+.PHONY: install-links
+install-links:
 	@cd $(DESTDIR)$(bindir) && \
 	  for p in $(perl_scripts); do \
-	    echo "$(LN_S) $(tex4htrel)/$$p.pl $$p"; \
-	    rm -f $$p; $(LN_S) $(tex4htrel)/$$p.pl $$p; \
-	  done; \
+	    rm -f $$p; \
+	    echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \
+	    $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
+	  done && \
 	  for p in $(shell_scripts); do \
-	    echo "$(LN_S) $(tex4htrel)/$$p.sh $$p"; \
-	    rm -f $$p; $(LN_S) $(tex4htrel)/$$p.sh $$p; \
+	    rm -f $$p; \
+	    echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \
+	    $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
 	  done
 
 uninstall-hook:
-	@for p in $(perl_scripts) $(shell_scripts); do \
-	  echo "rm -f '$(DESTDIR)$(bindir)/$$p'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$p"; \
-	done
 	@for p in $(perl_scripts:=.pl) $(shell_scripts:=.sh); do \
 	  echo "rm -f '$(DESTDIR)$(tex4htdir)/$$p'"; \
 	  rm -f "$(DESTDIR)$(tex4htdir)/$$p"; \
 	done
+	@for p in $(perl_scripts) $(shell_scripts); do \
+	  echo "rm -f '$(DESTDIR)$(bindir)/$$p'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$p"; \
+	done
 
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
diff --git a/Build/source/texk/tex4htk/ac/withenable.ac b/Build/source/texk/tex4htk/ac/withenable.ac
index d2396d98304..e79a0d42611 100644
--- a/Build/source/texk/tex4htk/ac/withenable.ac
+++ b/Build/source/texk/tex4htk/ac/withenable.ac
@@ -1,3 +1,7 @@
-## texk/tex4htk/ac/withenable.ac
+## texk/tex4htk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/tex4htk/
+dnl
+dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
 ## configure options and TL libraries required for tex4htk
 KPSE_WITH_PROG([tex4htk], [kpathsea])
diff --git a/Build/source/texk/tex4htk/configure b/Build/source/texk/tex4htk/configure
index 1e8d4a2f5d7..491c4f69731 100755
--- a/Build/source/texk/tex4htk/configure
+++ b/Build/source/texk/tex4htk/configure
@@ -788,8 +788,6 @@ ac_includes_default="\
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-tex4htrel
-tex4htdir
 KPATHSEA_RULE
 KPATHSEA_DEPEND
 KPATHSEA_LIBS
@@ -4171,13 +4169,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4174: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4172: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4177: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4175: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4180: output\"" >&5)
+  (eval echo "\"\$as_me:4178: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5383,7 +5381,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5386 "configure"' > conftest.$ac_ext
+  echo '#line 5384 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7430,11 +7428,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7433: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7431: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7437: \$? = $ac_status" >&5
+   echo "$as_me:7435: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7769,11 +7767,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7772: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7770: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7776: \$? = $ac_status" >&5
+   echo "$as_me:7774: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7874,11 +7872,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7877: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7875: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7881: \$? = $ac_status" >&5
+   echo "$as_me:7879: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -7929,11 +7927,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7932: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7930: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7936: \$? = $ac_status" >&5
+   echo "$as_me:7934: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10729,7 +10727,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10732 "configure"
+#line 10730 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10825,7 +10823,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10828 "configure"
+#line 10826 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14532,16 +14530,6 @@ ${top_builddir}/../kpathsea/paths.h:
 fi
 
 
-tex4ht_subdir='texmf-dist/scripts/tex4ht'
-tex4htdir="\${prefix}/$tex4ht_subdir"
-
-if test "x$bindir" = 'x${exec_prefix}/bin'; then
-  tex4htrel="../$tex4ht_subdir"
-else
-  tex4htrel="../../$tex4ht_subdir"
-fi
-
-
 ac_config_files="$ac_config_files Makefile"
 
 
diff --git a/Build/source/texk/tex4htk/configure.ac b/Build/source/texk/tex4htk/configure.ac
index f997cc9dde6..a55f6ff90dc 100644
--- a/Build/source/texk/tex4htk/configure.ac
+++ b/Build/source/texk/tex4htk/configure.ac
@@ -21,17 +21,6 @@ AC_CHECK_SIZEOF([int])
 
 KPSE_KPATHSEA_FLAGS
 
-tex4ht_subdir='texmf-dist/scripts/tex4ht'
-tex4htdir="\${prefix}/$tex4ht_subdir"
-AC_SUBST([tex4htdir])
-dnl This is not quite right, should actually be decided by 'make install'
-if test "x$bindir" = 'x${exec_prefix}/bin'; then
-  tex4htrel="../$tex4ht_subdir"
-else
-  tex4htrel="../../$tex4ht_subdir"
-fi
-AC_SUBST([tex4htrel])
-
 AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
diff --git a/Build/source/texk/tex4htk/java/DbUtilities.java b/Build/source/texk/tex4htk/java/DbUtilities.java
index 887d22b16be..887d22b16be 100755..100644
--- a/Build/source/texk/tex4htk/java/DbUtilities.java
+++ b/Build/source/texk/tex4htk/java/DbUtilities.java
diff --git a/Build/source/texk/tex4htk/java/xtpipes/XtpipesPrintWriter.java b/Build/source/texk/tex4htk/java/xtpipes/XtpipesPrintWriter.java
index 28eff6c12b3..28eff6c12b3 100755..100644
--- a/Build/source/texk/tex4htk/java/xtpipes/XtpipesPrintWriter.java
+++ b/Build/source/texk/tex4htk/java/xtpipes/XtpipesPrintWriter.java