install linked perl scripts

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

5 files changed, 235 insertions, 36 deletions

diff --git a/Build/source/utils/chktex/ChangeLog b/Build/source/utils/chktex/ChangeLog
index 4331fb72ac3..f98cc75010c 100644
--- a/Build/source/utils/chktex/ChangeLog
+++ b/Build/source/utils/chktex/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-09  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am, configure.ac: Install linked perl script.
+
 2010-12-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Makefile.am, configure.ac [WIN32]: Skip chkweb shell script.
diff --git a/Build/source/utils/chktex/Makefile.am b/Build/source/utils/chktex/Makefile.am
index 08c4209bc56..5812cacc633 100644
--- a/Build/source/utils/chktex/Makefile.am
+++ b/Build/source/utils/chktex/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am for the TeX Live subdirectory utils/chktex/
 ##
-## Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
 #************************************************************************
@@ -52,9 +52,49 @@ man_MANS = \
 	$(CHKTEX_TREE)/chkweb.1 \
 	$(CHKTEX_TREE)/deweb.1
 
-nodist_bin_SCRIPTS = deweb
+perl_scripts = deweb
+
+scriptsdir = texmf/scripts/chktex
+texmfdir = ${prefix}/$(scriptsdir)
+nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+
+if WIN32
+if WIN32_WRAP
+## We treat the WIN32 wrappers as SCRIPTS to avoid automatic build rules
+nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
+runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+$(nodist_bin_SCRIPTS): $(runscript)
+	$(LN_S) $(runscript) $@
+endif WIN32_WRAP
+else !WIN32
+bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
+endif !WIN32
+
+install-data-hook:
 if !WIN32
-nodist_bin_SCRIPTS += $(CHKTEX_TREE)/chkweb
+	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
+endif !WIN32
+
+.PHONY: install-links
+install-links:
+	@cd $(DESTDIR)$(bindir) && \
+	  for f in $(perl_scripts); do \
+	    rm -f $$f; \
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
+	  done  
+
+uninstall-hook:
+if !WIN32
+	@for f in $(perl_scripts); do \
+	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+	done
 endif !WIN32
 
 # resource file
@@ -70,7 +110,8 @@ dist_pdfdoc_DATA = ChkTeX.pdf
 ChkTeX.pdf: $(PDF_DEPEND)
 	$(PDFLATEX) -interaction batchmode $(srcdir)/ChkTeX.tex
 	$(PDFLATEX) -interaction batchmode $(srcdir)/ChkTeX.tex
-CLEANFILES = ChkTeX.aux ChkTeX.log
+
+CLEANFILES = $(nodist_bin_SCRIPTS) ChkTeX.aux ChkTeX.log
 
 ## We distribute ChkTeX.tex (generated from $(CHKTEX_TREE)/ChkTeX.tex.in)
 ## and ChkTeX.pdf, but also need rules to create them if missing or
diff --git a/Build/source/utils/chktex/Makefile.in b/Build/source/utils/chktex/Makefile.in
index 04e567b1dee..db1a7e81a61 100644
--- a/Build/source/utils/chktex/Makefile.in
+++ b/Build/source/utils/chktex/Makefile.in
@@ -35,7 +35,6 @@ NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
 bin_PROGRAMS = chktex$(EXEEXT)
-@WIN32_FALSE@am__append_1 = $(CHKTEX_TREE)/chkweb
 subdir = .
 DIST_COMMON = $(am__configure_deps) $(dist_pdfdoc_DATA) \
 	$(srcdir)/../../build-aux/depcomp \
@@ -58,9 +57,10 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = ChkTeX.tmp deweb
+CONFIG_CLEAN_FILES = ChkTeX.tmp deweb.pl
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" \
 	"$(DESTDIR)$(pdfdocdir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -90,7 +90,7 @@ am__nobase_list = $(am__nobase_strip_setup); \
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-SCRIPTS = $(nodist_bin_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -245,7 +245,13 @@ man_MANS = \
 	$(CHKTEX_TREE)/chkweb.1 \
 	$(CHKTEX_TREE)/deweb.1
 
-nodist_bin_SCRIPTS = deweb $(am__append_1)
+perl_scripts = deweb
+scriptsdir = texmf/scripts/chktex
+texmfdir = ${prefix}/$(scriptsdir)
+nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@nodist_bin_SCRIPTS = $(perl_scripts:=.exe)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
+@WIN32_FALSE@bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
 
 # resource file
 configdir = ${prefix}/texmf/chktex
@@ -254,7 +260,7 @@ config_DATA = $(CHKTEX_TREE)/chktexrc
 # documentation
 pdfdocdir = ${prefix}/texmf/doc/chktex
 dist_pdfdoc_DATA = ChkTeX.pdf
-CLEANFILES = ChkTeX.aux ChkTeX.log chktest
+CLEANFILES = $(nodist_bin_SCRIPTS) ChkTeX.aux ChkTeX.log chktest
 DISTCLEANFILES = stamp-tex
 
 # chktex tests
@@ -318,7 +324,7 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 ChkTeX.tmp: $(top_builddir)/config.status $(top_srcdir)/chktex-1.6.4/ChkTeX.tex.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-deweb: $(top_builddir)/config.status $(top_srcdir)/chktex-1.6.4/deweb.in
+deweb.pl: $(top_builddir)/config.status $(top_srcdir)/chktex-1.6.4/deweb.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
@@ -360,6 +366,40 @@ clean-binPROGRAMS:
 chktex$(EXEEXT): $(chktex_OBJECTS) $(chktex_DEPENDENCIES) 
 	@rm -f chktex$(EXEEXT)
 	$(LINK) $(chktex_OBJECTS) $(chktex_LDADD) $(LIBS)
+install-binSCRIPTS: $(bin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-binSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
@@ -394,6 +434,40 @@ uninstall-nodist_binSCRIPTS:
 	test -n "$$list" || exit 0; \
 	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
 	cd "$(DESTDIR)$(bindir)" && rm -f $$files
+install-nodist_texmfSCRIPTS: $(nodist_texmf_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(texmfdir)" || $(MKDIR_P) "$(DESTDIR)$(texmfdir)"
+	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \
+	     } \
+	; done
+
+uninstall-nodist_texmfSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(texmfdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(texmfdir)" && rm -f $$files
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -884,7 +958,7 @@ check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h \
 		all-local
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pdfdocdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pdfdocdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -938,13 +1012,15 @@ info: info-am
 info-am:
 
 install-data-am: install-configDATA install-dist_pdfdocDATA \
-	install-man
-
+	install-man install-nodist_texmfSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
+install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+	install-nodist_binSCRIPTS
 
 install-html: install-html-am
 
@@ -985,13 +1061,15 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-configDATA \
-	uninstall-dist_pdfdocDATA uninstall-man \
-	uninstall-nodist_binSCRIPTS
-
+uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	uninstall-configDATA uninstall-dist_pdfdocDATA uninstall-man \
+	uninstall-nodist_binSCRIPTS uninstall-nodist_texmfSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1
 
-.MAKE: all check-am install-am install-strip
+.MAKE: all check-am install-am install-data-am install-strip \
+	uninstall-am
 
 .PHONY: CTAGS GTAGS all all-am all-local am--refresh check check-TESTS \
 	check-am clean clean-binPROGRAMS clean-generic ctags dist \
@@ -1000,23 +1078,51 @@ uninstall-man: uninstall-man1
 	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-configDATA install-data \
-	install-data-am install-dist_pdfdocDATA install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-man1 install-nodist_binSCRIPTS 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 pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-configDATA \
-	uninstall-dist_pdfdocDATA uninstall-man uninstall-man1 \
-	uninstall-nodist_binSCRIPTS
+	install-binPROGRAMS install-binSCRIPTS install-configDATA \
+	install-data install-data-am install-data-hook \
+	install-dist_pdfdocDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-man1 \
+	install-nodist_binSCRIPTS install-nodist_texmfSCRIPTS \
+	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 pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-binSCRIPTS uninstall-configDATA \
+	uninstall-dist_pdfdocDATA uninstall-hook uninstall-man \
+	uninstall-man1 uninstall-nodist_binSCRIPTS \
+	uninstall-nodist_texmfSCRIPTS
 
 
 # in case of an SVN repository
 dist-hook:
 	rm -rf `find $(distdir) -name .svn`
+@WIN32_TRUE@@WIN32_WRAP_TRUE@$(nodist_bin_SCRIPTS): $(runscript)
+@WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
+
+install-data-hook:
+@WIN32_FALSE@	case "$(bindir)" in \
+@WIN32_FALSE@	  */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. install-links;; \
+@WIN32_FALSE@	  */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. install-links;; \
+@WIN32_FALSE@	  *) echo "strange directory '$(bindir)' for linked scripts" >&2; \
+@WIN32_FALSE@	     exit 1;; \
+@WIN32_FALSE@	esac
+
+.PHONY: install-links
+install-links:
+	@cd $(DESTDIR)$(bindir) && \
+	  for f in $(perl_scripts); do \
+	    rm -f $$f; \
+	    echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.pl'"; \
+	    $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \
+	  done  
+
+uninstall-hook:
+@WIN32_FALSE@	@for f in $(perl_scripts); do \
+@WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
+@WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+@WIN32_FALSE@	done
 
 ChkTeX.pdf: $(PDF_DEPEND)
 	$(PDFLATEX) -interaction batchmode $(srcdir)/ChkTeX.tex
diff --git a/Build/source/utils/chktex/configure b/Build/source/utils/chktex/configure
index 526c4486123..dc403357e09 100755
--- a/Build/source/utils/chktex/configure
+++ b/Build/source/utils/chktex/configure
@@ -608,6 +608,8 @@ LTLIBOBJS
 LIBOBJS
 PERL5
 CHKTEX_TREE
+WIN32_WRAP_FALSE
+WIN32_WRAP_TRUE
 WIN32_FALSE
 WIN32_TRUE
 PDF_DEPEND
@@ -3780,6 +3782,37 @@ else
 $as_echo "no, using $LN_S" >&6; }
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+  *@@@%%%=?*=@@@%%%*)
+    eval ac_cv_prog_make_${ac_make}_set=yes;;
+  *)
+    eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+  SET_MAKE="MAKE=${MAKE-make}"
+fi
+
 for ac_prog in pdflatex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -4624,6 +4657,14 @@ else
   WIN32_FALSE=
 fi
 
+ if test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe; then
+  WIN32_WRAP_TRUE=
+  WIN32_WRAP_FALSE='#'
+else
+  WIN32_WRAP_TRUE='#'
+  WIN32_WRAP_FALSE=
+fi
+
 
 CHKTEX_TREE=chktex-1.6.4
 
@@ -4634,7 +4675,7 @@ ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files ChkTeX.tmp:chktex-1.6.4/ChkTeX.tex.in"
 
-ac_config_files="$ac_config_files deweb:chktex-1.6.4/deweb.in"
+ac_config_files="$ac_config_files deweb.pl:chktex-1.6.4/deweb.in"
 
 
 cat >confcache <<\_ACEOF
@@ -4770,6 +4811,10 @@ if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
   as_fn_error $? "conditional \"WIN32\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${WIN32_WRAP_TRUE}" && test -z "${WIN32_WRAP_FALSE}"; then
+  as_fn_error $? "conditional \"WIN32_WRAP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -5378,7 +5423,7 @@ do
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "ChkTeX.tmp") CONFIG_FILES="$CONFIG_FILES ChkTeX.tmp:chktex-1.6.4/ChkTeX.tex.in" ;;
-    "deweb") CONFIG_FILES="$CONFIG_FILES deweb:chktex-1.6.4/deweb.in" ;;
+    "deweb.pl") CONFIG_FILES="$CONFIG_FILES deweb.pl:chktex-1.6.4/deweb.in" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
@@ -6069,7 +6114,7 @@ $as_echo X"$file" |
   done
 }
  ;;
-    "deweb":F) chmod +x deweb ;;
+    "deweb.pl":F) chmod +x deweb.pl ;;
 
   esac
 done # for ac_tag
diff --git a/Build/source/utils/chktex/configure.ac b/Build/source/utils/chktex/configure.ac
index 71c552da04c..9503bc2b0fe 100644
--- a/Build/source/utils/chktex/configure.ac
+++ b/Build/source/utils/chktex/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2010 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2010, 2011 Peter Breitenlohner <tex-live@tug.org>
 dnl
 dnl   This file is free software; the copyright holder
 dnl   gives unlimited permission to copy and/or distribute it,
@@ -30,6 +30,7 @@ KPSE_COMPILER_WARNINGS
 dnl Checks for programs.
 AC_PROG_INSTALL
 AC_PROG_LN_S
+AC_PROG_MAKE_SET
 AC_CHECK_PROGS([PDFLATEX], [pdflatex], [no])
 
 dnl No termlib/termcap/ncurses library for TeX Live
@@ -57,12 +58,14 @@ AC_DEFINE([TEX_LIVE], 1, [Define to 1 for a TeX Live build.])
 
 KPSE_CHECK_WIN32
 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+AM_CONDITIONAL([WIN32_WRAP],
+               [test -r $srcdir/../../texk/texlive/w32_wrapper/runscript.exe])
 
 AC_SUBST([CHKTEX_TREE], [chktex-]chktex_version)
 AC_SUBST([PERL5], ['/usr/bin/env perl'])
 
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([ChkTeX.tmp:chktex-]chktex_version[/ChkTeX.tex.in])
-AC_CONFIG_FILES([deweb:chktex-]chktex_version[/deweb.in], [chmod +x deweb])
+AC_CONFIG_FILES([deweb.pl:chktex-]chktex_version[/deweb.in], [chmod +x deweb.pl])
 
 AC_OUTPUT