chktex: Install chkweb as linked script

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

5 files changed, 60 insertions, 51 deletions

diff --git a/Build/source/texk/chktex/ChangeLog b/Build/source/texk/chktex/ChangeLog
index e1d11362c7e..30d7cf61ee6 100644
--- a/Build/source/texk/chktex/ChangeLog
+++ b/Build/source/texk/chktex/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-31  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am: Install chkweb as linked script.
+
 2012-07-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Moved from ../utils/chktex to here, using kpathsea.
diff --git a/Build/source/texk/chktex/Makefile.am b/Build/source/texk/chktex/Makefile.am
index ae35a3363f7..90105364e97 100644
--- a/Build/source/texk/chktex/Makefile.am
+++ b/Build/source/texk/chktex/Makefile.am
@@ -55,6 +55,7 @@ man_MANS = \
 	$(CHKTEX_TREE)/deweb.1
 
 perl_scripts = deweb
+sh_scripts = chkweb
 scriptsdir = texmf/scripts/chktex
 nodist_bin_SCRIPTS =
 
@@ -62,14 +63,11 @@ include $(srcdir)/../../texk/am/script_links.am
 
 texmfdir = $(datarootdir)/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
+texmf_SCRIPTS = $(CHKTEX_TREE)/chkweb.sh
 
-install-data-hook: install-perl-links
+install-data-hook: install-perl-links install-sh-links
 uninstall-hook: uninstall-links
 
-if !WIN32
-bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
-endif !WIN32
-
 # resource file
 configdir = $(datarootdir)/texmf/chktex
 
diff --git a/Build/source/texk/chktex/Makefile.in b/Build/source/texk/chktex/Makefile.in
index aea76873289..cdd1d065bcf 100644
--- a/Build/source/texk/chktex/Makefile.in
+++ b/Build/source/texk/chktex/Makefile.in
@@ -91,7 +91,7 @@ CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES = ChkTeX.tmp deweb.pl
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" \
+	"$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(texmfdir)" \
 	"$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" \
 	"$(DESTDIR)$(pdfdocdir)"
 PROGRAMS = $(bin_PROGRAMS)
@@ -128,7 +128,8 @@ am__uninstall_files_from_dir = { \
     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
          $(am__cd) "$$dir" && rm -f $$files; }; \
   }
-SCRIPTS = $(bin_SCRIPTS) $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS)
+SCRIPTS = $(nodist_bin_SCRIPTS) $(nodist_texmf_SCRIPTS) \
+	$(texmf_SCRIPTS)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -333,6 +334,7 @@ man_MANS = \
 	$(CHKTEX_TREE)/deweb.1
 
 perl_scripts = deweb
+sh_scripts = chkweb
 scriptsdir = texmf/scripts/chktex
 nodist_bin_SCRIPTS = $(am__append_1)
 all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
@@ -340,7 +342,7 @@ all_scripts = $(lua_scripts) $(perl_scripts) $(shell_scripts)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe
 texmfdir = $(datarootdir)/$(scriptsdir)
 nodist_texmf_SCRIPTS = $(perl_scripts:=.pl)
-@WIN32_FALSE@bin_SCRIPTS = $(CHKTEX_TREE)/chkweb
+texmf_SCRIPTS = $(CHKTEX_TREE)/chkweb.sh
 
 # resource file
 configdir = $(datarootdir)/texmf/chktex
@@ -460,9 +462,9 @@ clean-binPROGRAMS:
 chktex$(EXEEXT): $(chktex_OBJECTS) $(chktex_DEPENDENCIES) $(EXTRA_chktex_DEPENDENCIES) 
 	@rm -f chktex$(EXEEXT)
 	$(LINK) $(chktex_OBJECTS) $(chktex_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
+install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
@@ -489,18 +491,18 @@ install-binSCRIPTS: $(bin_SCRIPTS)
 	     } \
 	; done
 
-uninstall-binSCRIPTS:
+uninstall-nodist_binSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
+install-nodist_texmfSCRIPTS: $(nodist_texmf_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \
 	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(texmfdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(texmfdir)" || exit 1; \
 	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
@@ -519,20 +521,20 @@ install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS)
 	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 $$?; \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(texmfdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(texmfdir)$$dir" || exit $$?; \
 	     } \
 	; done
 
-uninstall-nodist_binSCRIPTS:
+uninstall-nodist_texmfSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
-	dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir)
-install-nodist_texmfSCRIPTS: $(nodist_texmf_SCRIPTS)
+	dir='$(DESTDIR)$(texmfdir)'; $(am__uninstall_files_from_dir)
+install-texmfSCRIPTS: $(texmf_SCRIPTS)
 	@$(NORMAL_INSTALL)
-	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \
+	@list='$(texmf_SCRIPTS)'; test -n "$(texmfdir)" || list=; \
 	if test -n "$$list"; then \
 	  echo " $(MKDIR_P) '$(DESTDIR)$(texmfdir)'"; \
 	  $(MKDIR_P) "$(DESTDIR)$(texmfdir)" || exit 1; \
@@ -559,9 +561,9 @@ install-nodist_texmfSCRIPTS: $(nodist_texmf_SCRIPTS)
 	     } \
 	; done
 
-uninstall-nodist_texmfSCRIPTS:
+uninstall-texmfSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \
+	@list='$(texmf_SCRIPTS)'; test -n "$(texmfdir)" || exit 0; \
 	files=`for p in $$list; do echo "$$p"; done | \
 	       sed -e 's,.*/,,;$(transform)'`; \
 	dir='$(DESTDIR)$(texmfdir)'; $(am__uninstall_files_from_dir)
@@ -1109,7 +1111,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pdfdocdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(texmfdir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(pdfdocdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -1167,15 +1169,14 @@ info: info-am
 info-am:
 
 install-data-am: install-configDATA install-dist_pdfdocDATA \
-	install-man install-nodist_texmfSCRIPTS
+	install-man install-nodist_texmfSCRIPTS install-texmfSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
 install-dvi: install-dvi-am
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-	install-nodist_binSCRIPTS
+install-exec-am: install-binPROGRAMS install-nodist_binSCRIPTS
 
 install-html: install-html-am
 
@@ -1217,9 +1218,10 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-configDATA uninstall-dist_pdfdocDATA uninstall-man \
-	uninstall-nodist_binSCRIPTS uninstall-nodist_texmfSCRIPTS
+uninstall-am: uninstall-binPROGRAMS uninstall-configDATA \
+	uninstall-dist_pdfdocDATA uninstall-man \
+	uninstall-nodist_binSCRIPTS uninstall-nodist_texmfSCRIPTS \
+	uninstall-texmfSCRIPTS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
 uninstall-man: uninstall-man1
@@ -1235,21 +1237,20 @@ uninstall-man: uninstall-man1
 	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-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 mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-binSCRIPTS \
+	install-binPROGRAMS 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 install-texmfSCRIPTS \
+	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-configDATA uninstall-dist_pdfdocDATA uninstall-hook \
 	uninstall-man uninstall-man1 uninstall-nodist_binSCRIPTS \
-	uninstall-nodist_texmfSCRIPTS
+	uninstall-nodist_texmfSCRIPTS uninstall-texmfSCRIPTS
 
 
 # in case of an SVN repository
@@ -1257,7 +1258,7 @@ dist-hook:
 	rm -rf `find $(distdir) -name .svn`
 
 $(chktex_OBJECTS): $(KPATHSEA_DEPEND)
-.PHONY: install-lua-links install-perl-links install-shell-links \
+.PHONY: install-lua-links install-perl-links install-shell-links install-sh-links \
 	install-links uninstall-links
 @WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
 @WIN32_TRUE@@WIN32_WRAP_TRUE@	$(LN_S) $(runscript) $@
@@ -1271,6 +1272,9 @@ install-perl-links:
 install-shell-links:
 @WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
 
+install-sh-links:
+@WIN32_FALSE@	$(MAKE) $(AM_MAKEFLAGS) TYPE=sh EXT=sh install-links
+
 # We support native builds, multiplatform or not, as well as distro builds.
 install-links:
 	@REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(datarootdir)'`; \
@@ -1286,12 +1290,12 @@ install-links:
 	  done  
 
 uninstall-links:
-@WIN32_FALSE@	@for f in $(all_scripts); do \
+@WIN32_FALSE@	@for f in $(all_scripts) $(sh_scripts); do \
 @WIN32_FALSE@	  echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \
 @WIN32_FALSE@	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
 @WIN32_FALSE@	done
 
-install-data-hook: install-perl-links
+install-data-hook: install-perl-links install-sh-links
 uninstall-hook: uninstall-links
 
 @KPATHSEA_RULE@
diff --git a/Build/source/texk/chktex/chktex-1.6.6-PATCHES/TL-Changes b/Build/source/texk/chktex/chktex-1.6.6-PATCHES/TL-Changes
index e043e33b936..607d2d5ff34 100644
--- a/Build/source/texk/chktex/chktex-1.6.6-PATCHES/TL-Changes
+++ b/Build/source/texk/chktex/chktex-1.6.6-PATCHES/TL-Changes
@@ -3,12 +3,15 @@ Changes applied to the chktex-1.6.6 tree as obtained from:
 	otherwise the same as
 	http://download.savannah.gnu.org/releases/chktex/chktex-1.6.6.tar.gz
 
-Removed:
+Remove:
 	autom4te.cache/
 	configure
 	install-sh
 	stamp-h.in
 
-Added execute permissions:
-	chkweb
+Rename:
+	chkweb -> chkweb.sh
+
+Add execute permissions:
+	chkweb.sh
 
diff --git a/Build/source/texk/chktex/chktex-1.6.6/chkweb b/Build/source/texk/chktex/chktex-1.6.6/chkweb.sh
index 8d6361d1097..8d6361d1097 100755
--- a/Build/source/texk/chktex/chktex-1.6.6/chkweb
+++ b/Build/source/texk/chktex/chktex-1.6.6/chkweb.sh