summaryrefslogtreecommitdiff
path: root/Build/source/texk/tex4htk
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2011-09-29 12:17:38 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2011-09-29 12:17:38 +0000
commit307a409e5a3cc8c467bbe5d0e0fe9beacf620adf (patch)
tree77b4d4f00642c3c1c86755e63cd5d2424b058972 /Build/source/texk/tex4htk
parent54b9868277dbd900c93d8b750654b9ed43b51b26 (diff)
somewhat more general way to create symlinks for linked scripts
using build-aux/relpath git-svn-id: svn://tug.org/texlive/trunk@24137 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/tex4htk')
-rw-r--r--Build/source/texk/tex4htk/ChangeLog4
-rw-r--r--Build/source/texk/tex4htk/Makefile.am16
-rw-r--r--Build/source/texk/tex4htk/Makefile.in164
3 files changed, 44 insertions, 140 deletions
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog
index dd26aca9c8b..cf6cc702bbc 100644
--- a/Build/source/texk/tex4htk/ChangeLog
+++ b/Build/source/texk/tex4htk/ChangeLog
@@ -1,3 +1,7 @@
+2011-09-09 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am: Adapt to script_links.am using relpath.
+
2011-03-31 Peter Breitenlohner <peb@mppmu.mpg.de>
Rename ht{,context,latex,mex,tex,texi,xelatex,xetex} => ht*.sh.
diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am
index 696d5391e65..f5b4589f5a0 100644
--- a/Build/source/texk/tex4htk/Makefile.am
+++ b/Build/source/texk/tex4htk/Makefile.am
@@ -1,10 +1,17 @@
## Makefile.am for the TeX Live subdirectory texk/tex4htk/
##
-## Copyright (C) 2009 - 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2009-2011 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
##
ACLOCAL_AMFLAGS = -I ../../m4
+## We distribute the whole java tree.
+EXTRA_DIST = java
+
+# in case of an SVN repository
+dist-hook:
+ rm -rf `find $(distdir) -name .svn`
+
INCLUDES = $(KPATHSEA_INCLUDES)
AM_CPPFLAGS = -DANSI -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
@@ -43,7 +50,7 @@ CLEANFILES = $(nodist_bin_SCRIPTS)
## Not used
##
-EXTRA_DIST = \
+EXTRA_DIST += \
dbcontext \
dblatex \
dbmcontext \
@@ -66,7 +73,6 @@ EXTRA_DIST = \
estexi \
esxelatex \
esxetex \
- java \
jh1context \
jh1latex \
jh1mex \
@@ -157,7 +163,3 @@ EXTRA_DIST = \
xhxetex \
xv4ht.java
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn`
-
diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in
index ef5c9ac5868..4872a2666c3 100644
--- a/Build/source/texk/tex4htk/Makefile.in
+++ b/Build/source/texk/tex4htk/Makefile.in
@@ -256,6 +256,23 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
+EXTRA_DIST = java ../../build-aux/relpath dbcontext dblatex dbmcontext \
+ dbmex dbmlatex dbmmex dbmtex dbmtexi dbmxelatex dbmxetex dbtex \
+ dbtexi dbxelatex dbxetex demo.tex escontext eslatex esmex \
+ estex estexi esxelatex esxetex jh1context jh1latex jh1mex \
+ jh1tex jh1texi jh1xelatex jh1xetex jhcontext jhlatex jhmex \
+ jhtex jhtexi jhxelatex jhxetex jmcontext jmlatex jmmex jmtex \
+ jmtexi jmxelatex jmxetex jscontext jslatex jsmex jstex jstexi \
+ jsxelatex jsxetex mzcontext mzlatex mzmex mztex mztexi \
+ mzxelatex mzxetex oocontext oolatex oomex ootex ootexi \
+ ooxelatex ooxetex teicontext teilatex teimcontext teimex \
+ teimlatex teimmex teimtex teimtexi teimxelatex teimxetex \
+ teitex teitexi teixelatex teixetex test.tex test1.tex \
+ testa.tex testb.tex 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
INCLUDES = $(KPATHSEA_INCLUDES)
AM_CPPFLAGS = -DANSI -DKPATHSEA
AM_CFLAGS = $(WARNING_CFLAGS)
@@ -273,120 +290,6 @@ texmfdir = ${prefix}/$(scriptsdir)
dist_texmf_SCRIPTS = $(perl_scripts:=.pl) $(shell_scripts:=.sh)
@WIN32_TRUE@dist_bin_SCRIPTS = $(shell_scripts:=.bat)
CLEANFILES = $(nodist_bin_SCRIPTS)
-EXTRA_DIST = \
- dbcontext \
- dblatex \
- dbmcontext \
- dbmex \
- dbmlatex \
- dbmmex \
- dbmtex \
- dbmtexi \
- dbmxelatex \
- dbmxetex \
- dbtex \
- dbtexi \
- dbxelatex \
- dbxetex \
- demo.tex \
- escontext \
- eslatex \
- esmex \
- estex \
- estexi \
- esxelatex \
- esxetex \
- java \
- jh1context \
- jh1latex \
- jh1mex \
- jh1tex \
- jh1texi \
- jh1xelatex \
- jh1xetex \
- jhcontext \
- jhlatex \
- jhmex \
- jhtex \
- jhtexi \
- jhxelatex \
- jhxetex \
- jmcontext \
- jmlatex \
- jmmex \
- jmtex \
- jmtexi \
- jmxelatex \
- jmxetex \
- jscontext \
- jslatex \
- jsmex \
- jstex \
- jstexi \
- jsxelatex \
- jsxetex \
- mzcontext \
- mzlatex \
- mzmex \
- mztex \
- mztexi \
- mzxelatex \
- mzxetex \
- oocontext \
- oolatex \
- oomex \
- ootex \
- ootexi \
- ooxelatex \
- ooxetex \
- teicontext \
- teilatex \
- teimcontext \
- teimex \
- teimlatex \
- teimmex \
- teimtex \
- teimtexi \
- teimxelatex \
- teimxetex \
- teitex \
- teitexi \
- teixelatex \
- teixetex \
- test.tex \
- test1.tex \
- testa.tex \
- testb.tex \
- 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
-
all: c-auto.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -970,13 +873,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_binSCRIPTS \
uninstall-hook uninstall-nodist_binSCRIPTS
+# in case of an SVN repository
+dist-hook:
+ rm -rf `find $(distdir) -name .svn`
+
$(t4ht_OBJECTS) $(tex4ht_OBJECTS): $(KPATHSEA_DEPEND)
@KPATHSEA_RULE@
-
-#
.PHONY: install-lua-links install-perl-links install-shell-links \
- install-links make-links uninstall-links
+ install-links uninstall-links
@WIN32_TRUE@@WIN32_WRAP_TRUE@$(wrappers): $(runscript)
@WIN32_TRUE@@WIN32_WRAP_TRUE@ $(LN_S) $(runscript) $@
@@ -989,21 +894,18 @@ install-perl-links:
install-shell-links:
@WIN32_FALSE@ $(MAKE) $(AM_MAKEFLAGS) TYPE=shell EXT=sh install-links
-# We support both multiplatform and non-multiplatform builds.
+# We support native builds, multiplatform or not, as well as distro builds.
install-links:
- case "$(bindir)" in \
- */bin) $(MAKE) $(AM_MAKEFLAGS) REL=.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- */bin/*) $(MAKE) $(AM_MAKEFLAGS) REL=../.. TYPE=$(TYPE) EXT=$(EXT) make-links;; \
- *) echo "strange directory '$(bindir)' for linked $(TYPE) scripts" >&2; \
- exit 1;; \
- esac
-
-make-links:
- @cd $(DESTDIR)$(bindir) && \
+ @REL=`$(SHELL) $(srcdir)/../../build-aux/relpath '$(DESTDIR)' '$(bindir)' '$(prefix)'`; \
+ if test -z "$$REL"; then \
+ echo 'unable to compute relative path for linked $(TYPE) scripts' >&2; \
+ exit 1; \
+ fi; \
+ cd $(DESTDIR)$(bindir) && \
for f in $($(TYPE)_scripts); do \
rm -f $$f; \
- echo "creating link '$$f' -> '$(REL)/$(scriptsdir)/$$f.$(EXT)'"; \
- $(LN_S) $(REL)/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
+ echo "creating link '$$f' -> '$$REL/$(scriptsdir)/$$f.$(EXT)'"; \
+ $(LN_S) $$REL/$(scriptsdir)/$$f.$(EXT) $$f || exit 1; \
done
uninstall-links:
@@ -1015,10 +917,6 @@ uninstall-links:
install-data-hook: install-perl-links install-shell-links
uninstall-hook: uninstall-links
-# in case of an SVN repository
-dist-hook:
- rm -rf `find $(distdir) -name .svn`
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: