diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-31 12:17:01 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2011-03-31 12:17:01 +0000 |
commit | 3cc388b38baa1753180bf4a02aade22a6e461638 (patch) | |
tree | 2fb531d216318b317c732d72869736eb4e2f5820 /Build/source/utils/chktex | |
parent | bb9fb0ff57117f1eef90f381c0b0b767e33058ff (diff) |
Makefile fragment for linked perl scripts
git-svn-id: svn://tug.org/texlive/trunk@21901 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/chktex')
-rw-r--r-- | Build/source/utils/chktex/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/utils/chktex/Makefile.am | 43 | ||||
-rw-r--r-- | Build/source/utils/chktex/Makefile.in | 30 |
3 files changed, 29 insertions, 48 deletions
diff --git a/Build/source/utils/chktex/ChangeLog b/Build/source/utils/chktex/ChangeLog index 1021135049e..88994eaa272 100644 --- a/Build/source/utils/chktex/ChangeLog +++ b/Build/source/utils/chktex/ChangeLog @@ -1,3 +1,7 @@ +2011-03-31 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am: Use the ../../texk/am/script_links.am fragment. + 2011-03-16 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.ac: Use KPSE_CHECK_PDFLATEX Autoconf macro. diff --git a/Build/source/utils/chktex/Makefile.am b/Build/source/utils/chktex/Makefile.am index 5812cacc633..4955ff22348 100644 --- a/Build/source/utils/chktex/Makefile.am +++ b/Build/source/utils/chktex/Makefile.am @@ -53,48 +53,19 @@ man_MANS = \ $(CHKTEX_TREE)/deweb.1 perl_scripts = deweb - scriptsdir = texmf/scripts/chktex -texmfdir = ${prefix}/$(scriptsdir) -nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) +nodist_bin_SCRIPTS = -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 +include $(srcdir)/../../texk/am/script_links.am -install-data-hook: -if !WIN32 - 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 +texmfdir = ${prefix}/$(scriptsdir) +nodist_texmf_SCRIPTS = $(perl_scripts:=.pl) -.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 +install-data-hook: install-perl-links +uninstall-hook: uninstall-perl-links -uninstall-hook: if !WIN32 - @for f in $(perl_scripts); do \ - echo "rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done +bin_SCRIPTS = $(CHKTEX_TREE)/chkweb endif !WIN32 # resource file diff --git a/Build/source/utils/chktex/Makefile.in b/Build/source/utils/chktex/Makefile.in index 10e36da1979..10b61a55a27 100644 --- a/Build/source/utils/chktex/Makefile.in +++ b/Build/source/utils/chktex/Makefile.in @@ -35,11 +35,11 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = chktex$(EXEEXT) -subdir = . DIST_COMMON = $(am__configure_deps) $(dist_pdfdoc_DATA) \ $(srcdir)/../../build-aux/depcomp \ $(srcdir)/../../build-aux/install-sh \ - $(srcdir)/../../build-aux/missing $(srcdir)/Makefile.am \ + $(srcdir)/../../build-aux/missing \ + $(srcdir)/../../texk/am/script_links.am $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/chktex-1.6.4/ChkTeX.tex.in \ $(top_srcdir)/chktex-1.6.4/deweb.in $(top_srcdir)/configure \ @@ -47,6 +47,8 @@ DIST_COMMON = $(am__configure_deps) $(dist_pdfdoc_DATA) \ ../../build-aux/depcomp ../../build-aux/install-sh \ ../../build-aux/ltmain.sh ../../build-aux/missing \ ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog +@WIN32_TRUE@@WIN32_WRAP_TRUE@am__append_1 = $(perl_wrappers) +subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-progs.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ @@ -248,10 +250,11 @@ man_MANS = \ perl_scripts = deweb scriptsdir = texmf/scripts/chktex +nodist_bin_SCRIPTS = $(am__append_1) +@WIN32_TRUE@@WIN32_WRAP_TRUE@perl_wrappers = $(perl_scripts:=.exe) +@WIN32_TRUE@@WIN32_WRAP_TRUE@runscript = $(top_srcdir)/../../texk/texlive/w32_wrapper/runscript.exe 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 @@ -274,7 +277,7 @@ all: config.h .SUFFIXES: .c .o .obj am--refresh: @: -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/../../texk/am/script_links.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1099,19 +1102,19 @@ uninstall-man: uninstall-man1 # in case of an SVN repository dist-hook: rm -rf `find $(distdir) -name .svn` -@WIN32_TRUE@@WIN32_WRAP_TRUE@$(nodist_bin_SCRIPTS): $(runscript) +.PHONY: install-perl-links make-perl-links uninstall-perl-links +@WIN32_TRUE@@WIN32_WRAP_TRUE@$(perl_wrappers): $(runscript) @WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@ -install-data-hook: +install-perl-links: @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@ */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. make-perl-links;; \ +@WIN32_FALSE@ */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. make-perl-links;; \ @WIN32_FALSE@ *) echo "strange directory '$(bindir)' for linked scripts" >&2; \ @WIN32_FALSE@ exit 1;; \ @WIN32_FALSE@ esac -.PHONY: install-links -install-links: +make-perl-links: @cd $(DESTDIR)$(bindir) && \ for f in $(perl_scripts); do \ rm -f $$f; \ @@ -1119,12 +1122,15 @@ install-links: $(LN_S) $(REL)/$(scriptsdir)/$$f.pl $$f || exit 1; \ done -uninstall-hook: +uninstall-perl-links: @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 +install-data-hook: install-perl-links +uninstall-hook: uninstall-perl-links + ChkTeX.pdf: $(PDF_DEPEND) $(PDFLATEX) -interaction batchmode $(srcdir)/ChkTeX.tex $(PDFLATEX) -interaction batchmode $(srcdir)/ChkTeX.tex |