summaryrefslogtreecommitdiff
path: root/Build/source/texk
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/Makefile.am2
-rw-r--r--Build/source/texk/kpathsea/Makefile.in2
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.am2
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.in2
-rw-r--r--Build/source/texk/tetex/ChangeLog5
-rw-r--r--Build/source/texk/tetex/Makefile.am4
-rw-r--r--Build/source/texk/tetex/Makefile.in4
-rw-r--r--Build/source/texk/tex4htk/ChangeLog4
-rw-r--r--Build/source/texk/tex4htk/Makefile.am4
-rw-r--r--Build/source/texk/tex4htk/Makefile.in4
-rw-r--r--Build/source/texk/texlive/linked_scripts/ChangeLog4
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.am6
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in6
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/Makefile.am19
-rw-r--r--Build/source/texk/web2c/Makefile.in190
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/luatexdir/am/luatex.am13
-rw-r--r--Build/source/texk/web2c/man/ChangeLog4
-rw-r--r--Build/source/texk/web2c/man/Makefile.am2
-rw-r--r--Build/source/texk/web2c/man/Makefile.in2
-rw-r--r--Build/source/texk/web2c/mplibdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/mplibdir/am/mplib.am10
24 files changed, 174 insertions, 135 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index e40c3aaa622..9cfc2051f22 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (install-exec-hook): Check symlink creation.
+ * man/Makefile.am (install-data-hook): The same.
+
2010-12-24 Karl Berry <karl@tug.org>
* Makefile.am (stamp-paths): ensure that grep is not completely
diff --git a/Build/source/texk/kpathsea/Makefile.am b/Build/source/texk/kpathsea/Makefile.am
index 29050d33e5a..a422beaf223 100644
--- a/Build/source/texk/kpathsea/Makefile.am
+++ b/Build/source/texk/kpathsea/Makefile.am
@@ -281,7 +281,7 @@ if !WIN32
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link; \
echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link; \
+ $(LN_S) $$file $$link || exit 1; \
done
endif !WIN32
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index 797b44e985b..84f42357bde 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -1813,7 +1813,7 @@ install-exec-hook:
@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \
@WIN32_FALSE@ rm -f $$link; \
@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
-@WIN32_FALSE@ $(LN_S) $$file $$link; \
+@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \
@WIN32_FALSE@ done
install-data-hook:
diff --git a/Build/source/texk/kpathsea/man/Makefile.am b/Build/source/texk/kpathsea/man/Makefile.am
index 647a5c80cdd..6a929764624 100644
--- a/Build/source/texk/kpathsea/man/Makefile.am
+++ b/Build/source/texk/kpathsea/man/Makefile.am
@@ -30,7 +30,7 @@ install-data-hook:
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link.1; \
echo "creating link '$$link.1' -> '$$file.1'"; \
- $(LN_S) $$file.1 $$link.1; \
+ $(LN_S) $$file.1 $$link.1 || exit 1; \
done
uninstall-hook:
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index 2660b9ed789..6b2c11bcb1a 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -506,7 +506,7 @@ install-data-hook:
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link.1; \
echo "creating link '$$link.1' -> '$$file.1'"; \
- $(LN_S) $$file.1 $$link.1; \
+ $(LN_S) $$file.1 $$link.1 || exit 1; \
done
uninstall-hook:
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 0293cfb132f..741b71afbf4 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (install-exec-hook, install-data-hook): Check
+ symlink creation.
+
2010-12-25 Karl Berry <karl@tug.org>
* doc,
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index 85d917ea46b..c4d9bf0f8b9 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -93,7 +93,7 @@ if !WIN32
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link; \
echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link; \
+ $(LN_S) $$file $$link || exit 1; \
done
endif !WIN32
@@ -104,7 +104,7 @@ install-data-hook:
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link.1; \
echo "creating link '$$link.1' -> '$$file.1'"; \
- $(LN_S) $$file.1 $$link.1; \
+ $(LN_S) $$file.1 $$link.1 || exit 1; \
done
uninstall-hook:
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index b46dceb81b8..89102e88d02 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -813,7 +813,7 @@ install-exec-hook:
@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \
@WIN32_FALSE@ rm -f $$link; \
@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
-@WIN32_FALSE@ $(LN_S) $$file $$link; \
+@WIN32_FALSE@ $(LN_S) $$file $$link || exit 1; \
@WIN32_FALSE@ done
install-data-hook:
@@ -823,7 +823,7 @@ install-data-hook:
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link.1; \
echo "creating link '$$link.1' -> '$$file.1'"; \
- $(LN_S) $$file.1 $$link.1; \
+ $(LN_S) $$file.1 $$link.1 || exit 1; \
done
uninstall-hook:
diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog
index bfcb837b6e3..31692b96966 100644
--- a/Build/source/texk/tex4htk/ChangeLog
+++ b/Build/source/texk/tex4htk/ChangeLog
@@ -1,5 +1,9 @@
2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+ * Makefile.am (install-links): Check symlink creation.
+
+2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
* Makefile.am, configure.ac [WIN32]: Install wrapper binaries
instead of symlinks to scripts under texmf-dist/scripts/.
diff --git a/Build/source/texk/tex4htk/Makefile.am b/Build/source/texk/tex4htk/Makefile.am
index 6c6bb1e424d..ba1d772668e 100644
--- a/Build/source/texk/tex4htk/Makefile.am
+++ b/Build/source/texk/tex4htk/Makefile.am
@@ -76,12 +76,12 @@ install-links:
for p in $(perl_scripts); do \
rm -f $$p; \
echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \
- $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
+ $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p || exit 1; \
done && \
for p in $(shell_scripts); do \
rm -f $$p; \
echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \
- $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p; \
+ $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p || exit 1; \
done
uninstall-hook:
diff --git a/Build/source/texk/tex4htk/Makefile.in b/Build/source/texk/tex4htk/Makefile.in
index 103dc57c11b..d241ea008b2 100644
--- a/Build/source/texk/tex4htk/Makefile.in
+++ b/Build/source/texk/tex4htk/Makefile.in
@@ -897,12 +897,12 @@ install-links:
for p in $(perl_scripts); do \
rm -f $$p; \
echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.pl'"; \
- $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p; \
+ $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.pl $$p || exit 1; \
done && \
for p in $(shell_scripts); do \
rm -f $$p; \
echo "creating link '$$p' -> '$(REL)/$(tex4ht_subdir)/$$p.sh'"; \
- $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p; \
+ $(LN_S) $(REL)/$(tex4ht_subdir)/$$p.sh $$p || exit 1; \
done
uninstall-hook:
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog
index 49ced7b97eb..710e8be6e32 100644
--- a/Build/source/texk/texlive/linked_scripts/ChangeLog
+++ b/Build/source/texk/texlive/linked_scripts/ChangeLog
@@ -1,5 +1,9 @@
2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+ * Makefile.am (install-links): Check symlink creation.
+
+2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
* Makefile.am: Distinguish shell and perl (or lus, ...) scripts.
[WIN32]: Skip symlinks from bindir to texmf*/scripts/; install
wrapper binaries for perl scripts.
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am
index 4738301d861..7e7e912ace7 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.am
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.am
@@ -156,7 +156,7 @@ install-links:
target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
rm -f $$target; \
echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \
- $(LN_S) $(REL)/texmf/scripts/$$s $$target; \
+ $(LN_S) $(REL)/texmf/scripts/$$s $$target || exit 1; \
done && \
for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
@@ -164,14 +164,14 @@ install-links:
|| target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
rm -f $$target; \
echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \
- $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target; \
+ $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target || exit 1; \
done && \
for s in $(bin_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link; \
echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link; \
+ $(LN_S) $$file $$link || exit 1; \
done && \
rm -f man && \
if test -d $(REL)/texmf/doc/man; then \
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 8e6fff9d007..fae17bfebca 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -612,7 +612,7 @@ install-links:
target=`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \
rm -f $$target; \
echo "creating link '$$target' -> '$(REL)/texmf/scripts/$$s'"; \
- $(LN_S) $(REL)/texmf/scripts/$$s $$target; \
+ $(LN_S) $(REL)/texmf/scripts/$$s $$target || exit 1; \
done && \
for s in $(nobase_dist_texmf_dist_scripts_SCRIPTS); do \
target=`basename $$s | tr '[A-Z]' '[a-z]'`; \
@@ -620,14 +620,14 @@ install-links:
|| target=`echo $$target | sed 's,\.[^/]*$$,,'`; \
rm -f $$target; \
echo "creating link '$$target' -> '$(REL)/texmf-dist/scripts/$$s'"; \
- $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target; \
+ $(LN_S) $(REL)/texmf-dist/scripts/$$s $$target || exit 1; \
done && \
for s in $(bin_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link; \
echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link; \
+ $(LN_S) $$file $$link || exit 1; \
done && \
rm -f man && \
if test -d $(REL)/texmf/doc/man; then \
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index e92cc32d589..359ff086855 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (bin_links): New variable for required symlinks.
+ (install-exec-hook, uninstall-hook): Rules for symlinks.
+
2010-12-14 Karl Berry <karl@tug.org>
* bibtex.web: non-functional update to clarify license,
diff --git a/Build/source/texk/web2c/Makefile.am b/Build/source/texk/web2c/Makefile.am
index 32f05b8287d..04023075824 100644
--- a/Build/source/texk/web2c/Makefile.am
+++ b/Build/source/texk/web2c/Makefile.am
@@ -32,6 +32,7 @@ EXTRA_DIST = PROJECTS cftests cpascal.h help.h w2c/config.h
DISTCLEANFILES = $(EXTRA_LIBRARIES)
CLEANFILES =
TRIPTRAP =
+bin_links =
# in case of an SVN repository
dist-hook:
@@ -194,6 +195,24 @@ include $(srcdir)/synctexdir/am/synctex.am
## libmd5
include $(srcdir)/libmd5/am/md5.am
+# Symlinks within $(bindir): FILE:LINK indicates LINK$(EXEEXT)->FILE$(EXEEXT)
+install-exec-hook:
+ @test -z "$(bin_links)" || { \
+ cd $(DESTDIR)$(bindir) && \
+ for s in $(bin_links); do \
+ link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
+ file=`echo $$s | sed 's,:.*,,'`$(EXEEXT); \
+ rm -f $$link; \
+ echo "creating link '$$link' -> '$$file'"; \
+ $(LN_S) $$file $$link || exit 1; \
+ done; }
+uninstall-hook:
+ @test -z "$(bin_links)" || \
+ for s in $(bin_links); do \
+ link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
+ rm -f $(DESTDIR)$(bindir)/$$link; \
+ done
+
## Eventually delete these files
##
EXTRA_DIST += Makefile.in.orig configure.in.orig
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 52e9fcc2472..d4f5abc703e 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -52,9 +52,9 @@ check_PROGRAMS = $(am__EXEEXT_20) $(am__EXEEXT_21) $(am__EXEEXT_22) \
md5main$(EXEEXT)
TESTS = tangle.test $(am__EXEEXT_28) ctiedir/ctie.test \
cwebdir/cweave.test tiedir/tie.test $(am__append_4) \
- $(am__append_10) $(am__append_13) $(am__append_17) \
- $(am__append_22) $(am__append_26) $(am__append_29) \
- $(am__append_43) $(am__append_46) $(am__append_47) \
+ $(am__append_10) $(am__append_14) $(am__append_18) \
+ $(am__append_23) $(am__append_27) $(am__append_31) \
+ $(am__append_45) $(am__append_48) $(am__append_49) \
libmd5/md5.test
DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
$(srcdir)/../../build-aux/config.guess \
@@ -101,43 +101,45 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@MF_TRUE@am__append_10 = $(mf_tests)
@MF_TRUE@am__append_11 = gftype tftopl
@MP_TRUE@am__append_12 = mpost
-@MP_TRUE@am__append_13 = $(mp_tests)
-@MP_TRUE@am__append_14 = pltotf tftopl
-@MP_TRUE@am__append_15 = mptrap.diffs
-@ETEX_TRUE@am__append_16 = etex
-@ETEX_TRUE@am__append_17 = $(etex_tests)
-@ETEX_TRUE@am__append_18 = dvitype pltotf tftopl
-@ETEX_TRUE@am__append_19 = etrip.diffs
-@PTEX_TRUE@am__append_20 = ptex
-@PTEX_TRUE@@WEB_TRUE@am__append_21 = $(pweb_programs)
-@PTEX_TRUE@am__append_22 = $(ptex_tests)
-@PTEX_TRUE@am__append_23 = dvitype pltotf tftopl
-@PTEX_TRUE@am__append_24 = ptrip.diffs
-@PDFTEX_TRUE@am__append_25 = pdftex ttf2afm pdftosrc
-@PDFTEX_TRUE@am__append_26 = $(pdftex_tests)
-@MINGW32_TRUE@am__append_27 = \
+@MP_TRUE@am__append_13 = mpost:dvitomp
+@MP_TRUE@am__append_14 = $(mp_tests)
+@MP_TRUE@am__append_15 = pltotf tftopl
+@MP_TRUE@am__append_16 = mptrap.diffs
+@ETEX_TRUE@am__append_17 = etex
+@ETEX_TRUE@am__append_18 = $(etex_tests)
+@ETEX_TRUE@am__append_19 = dvitype pltotf tftopl
+@ETEX_TRUE@am__append_20 = etrip.diffs
+@PTEX_TRUE@am__append_21 = ptex
+@PTEX_TRUE@@WEB_TRUE@am__append_22 = $(pweb_programs)
+@PTEX_TRUE@am__append_23 = $(ptex_tests)
+@PTEX_TRUE@am__append_24 = dvitype pltotf tftopl
+@PTEX_TRUE@am__append_25 = ptrip.diffs
+@PDFTEX_TRUE@am__append_26 = pdftex ttf2afm pdftosrc
+@PDFTEX_TRUE@am__append_27 = $(pdftex_tests)
+@MINGW32_TRUE@am__append_28 = \
@MINGW32_TRUE@ pdftexdir/regex/regex.c \
@MINGW32_TRUE@ pdftexdir/regex/regex.h
-@LUATEX_TRUE@am__append_28 = luatex
-@LUATEX_TRUE@am__append_29 = $(luatex_tests)
-@MINGW32_FALSE@am__append_30 = -DLUA_USE_POSIX
-@XETEX_TRUE@am__append_31 = xetex
-@XETEX_MACOSX_TRUE@am__append_32 = -DXETEX_MAC
-@XETEX_MACOSX_TRUE@am__append_33 = libxetexmm.a
-@XETEX_MACOSX_FALSE@am__append_34 = -DXETEX_OTHER $(XPDF_INCLUDES) \
+@LUATEX_TRUE@am__append_29 = luatex
+@LUATEX_TRUE@am__append_30 = luatex:texlua luatex:texluac
+@LUATEX_TRUE@am__append_31 = $(luatex_tests)
+@MINGW32_FALSE@am__append_32 = -DLUA_USE_POSIX
+@XETEX_TRUE@am__append_33 = xetex
+@XETEX_MACOSX_TRUE@am__append_34 = -DXETEX_MAC
+@XETEX_MACOSX_TRUE@am__append_35 = libxetexmm.a
+@XETEX_MACOSX_FALSE@am__append_36 = -DXETEX_OTHER $(XPDF_INCLUDES) \
@XETEX_MACOSX_FALSE@ $(LIBPNG_INCLUDES) $(FONTCONFIG_INCLUDES)
-@XETEX_MACOSX_FALSE@am__append_35 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
-@XETEX_MACOSX_FALSE@am__append_36 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
-@XETEX_GRAPHITE_TRUE@am__append_37 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
-@XETEX_GRAPHITE_TRUE@am__append_38 = $(GRAPHITE_LIBS)
-@XETEX_GRAPHITE_TRUE@am__append_39 = $(GRAPHITE_DEPEND)
-@XETEX_MACOSX_TRUE@am__append_40 = \
+@XETEX_MACOSX_FALSE@am__append_37 = $(XPDF_LIBS) $(LIBPNG_LIBS) $(FONTCONFIG_LIBS)
+@XETEX_MACOSX_FALSE@am__append_38 = $(XPDF_DEPEND) $(LIBPNG_DEPEND)
+@XETEX_GRAPHITE_TRUE@am__append_39 = -DXETEX_GRAPHITE $(GRAPHITE_INCLUDES)
+@XETEX_GRAPHITE_TRUE@am__append_40 = $(GRAPHITE_LIBS)
+@XETEX_GRAPHITE_TRUE@am__append_41 = $(GRAPHITE_DEPEND)
+@XETEX_MACOSX_TRUE@am__append_42 = \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.cpp \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeXFontInst_Mac.h \
@XETEX_MACOSX_TRUE@ xetexdir/XeTeX_mac.c
-@XETEX_MACOSX_FALSE@am__append_41 = \
+@XETEX_MACOSX_FALSE@am__append_43 = \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.cpp \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeXFontMgr_FC.h \
@XETEX_MACOSX_FALSE@ xetexdir/XeTeX_pic.c \
@@ -154,39 +156,39 @@ DIST_COMMON = README $(am__configure_deps) $(dist_man_MANS) \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.c \
@XETEX_MACOSX_FALSE@ xetexdir/pngimage.h
-@XETEX_GRAPHITE_TRUE@am__append_42 = \
+@XETEX_GRAPHITE_TRUE@am__append_44 = \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.cpp \
@XETEX_GRAPHITE_TRUE@ xetexdir/XeTeXGrLayout.h
-@XETEX_TRUE@am__append_43 = $(xetex_tests)
-@OTANGLE_TRUE@am__append_44 = $(omegaware_tools)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_45 = $(omegaware_font_tools)
-@OTANGLE_TRUE@am__append_46 = $(OTANGLE_tests)
-@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_47 = $(OMFONTS_tests)
-@OTANGLE_TRUE@am__append_48 = pltotf tftopl
-@ALEPH_TRUE@am__append_49 = aleph
-@TEX_SYNCTEX_TRUE@am__append_50 = -I$(srcdir)/synctexdir \
+@XETEX_TRUE@am__append_45 = $(xetex_tests)
+@OTANGLE_TRUE@am__append_46 = $(omegaware_tools)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_47 = $(omegaware_font_tools)
+@OTANGLE_TRUE@am__append_48 = $(OTANGLE_tests)
+@OMFONTS_FALSE@@OTANGLE_TRUE@am__append_49 = $(OMFONTS_tests)
+@OTANGLE_TRUE@am__append_50 = pltotf tftopl
+@ALEPH_TRUE@am__append_51 = aleph
+@TEX_SYNCTEX_TRUE@am__append_52 = -I$(srcdir)/synctexdir \
@TEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__
-@TEX_SYNCTEX_TRUE@am__append_51 = $(ZLIB_LIBS)
-@TEX_SYNCTEX_TRUE@am__append_52 = $(ZLIB_DEPEND)
-@TEX_SYNCTEX_TRUE@am__append_53 = \
+@TEX_SYNCTEX_TRUE@am__append_53 = $(ZLIB_LIBS)
+@TEX_SYNCTEX_TRUE@am__append_54 = $(ZLIB_DEPEND)
+@TEX_SYNCTEX_TRUE@am__append_55 = \
@TEX_SYNCTEX_TRUE@ synctex.c
-@ETEX_SYNCTEX_TRUE@am__append_54 = -I$(srcdir)/synctexdir \
+@ETEX_SYNCTEX_TRUE@am__append_56 = -I$(srcdir)/synctexdir \
@ETEX_SYNCTEX_TRUE@ $(ZLIB_INCLUDES) -D__SyncTeX__
-@ETEX_SYNCTEX_TRUE@am__append_55 = $(ZLIB_LIBS)
-@ETEX_SYNCTEX_TRUE@am__append_56 = $(ZLIB_DEPEND)
-@ETEX_SYNCTEX_TRUE@am__append_57 = \
+@ETEX_SYNCTEX_TRUE@am__append_57 = $(ZLIB_LIBS)
+@ETEX_SYNCTEX_TRUE@am__append_58 = $(ZLIB_DEPEND)
+@ETEX_SYNCTEX_TRUE@am__append_59 = \
@ETEX_SYNCTEX_TRUE@ synctex-e.c
-@PDFTEX_SYNCTEX_TRUE@am__append_58 = -I$(srcdir)/synctexdir \
+@PDFTEX_SYNCTEX_TRUE@am__append_60 = -I$(srcdir)/synctexdir \
@PDFTEX_SYNCTEX_TRUE@ -D__SyncTeX__
-@PDFTEX_SYNCTEX_TRUE@am__append_59 = \
+@PDFTEX_SYNCTEX_TRUE@am__append_61 = \
@PDFTEX_SYNCTEX_TRUE@ synctex-pdf.c
-@XETEX_SYNCTEX_TRUE@am__append_60 = -I$(srcdir)/synctexdir \
+@XETEX_SYNCTEX_TRUE@am__append_62 = -I$(srcdir)/synctexdir \
@XETEX_SYNCTEX_TRUE@ -D__SyncTeX__
-@XETEX_SYNCTEX_TRUE@am__append_61 = \
+@XETEX_SYNCTEX_TRUE@am__append_63 = \
@XETEX_SYNCTEX_TRUE@ synctex-xe.c
subdir = .
@@ -1438,8 +1440,9 @@ DISTCLEANFILES = $(EXTRA_LIBRARIES) tangle.c tangle.h tangle.p \
omegaware/tests/xspecialhex.* $(nodist_aleph_SOURCES) \
aleph.web aleph.ch aleph-web2c aleph.p aleph.pool aleph-tangle
CLEANFILES =
-TRIPTRAP = $(am__append_6) $(am__append_9) $(am__append_15) \
- $(am__append_19) $(am__append_24)
+TRIPTRAP = $(am__append_6) $(am__append_9) $(am__append_16) \
+ $(am__append_20) $(am__append_25)
+bin_links = $(am__append_13) $(am__append_30)
web2c = $(SHELL) ./web2c-sh $@
makecpool = web2c/makecpool
@@ -1523,18 +1526,18 @@ cweave_CFLAGS = $(WARNING_CFLAGS)
nodist_tie_SOURCES = tie.c
tie_CPPFLAGS = $(AM_CPPFLAGS) -DNOT_WEB2C
tie_CFLAGS = $(WARNING_CFLAGS)
-tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_50)
+tex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_52)
tex_CFLAGS = $(WARNING_CFLAGS)
# With --enable-ipc, TeX may need to link with -lsocket.
-tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_51)
+tex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_53)
# TeX C sources
tex_c_h = texini.c tex0.c texcoerce.h texd.h
-nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_53)
+nodist_tex_SOURCES = $(tex_c_h) tex-pool.c texextra.c $(am__append_55)
# We must create texd.h before building the tex_OBJECTS.
-tex_prereq = texd.h $(am__append_52)
+tex_prereq = texd.h $(am__append_54)
tex_ch_srcs = \
tex.web \
tex.ch \
@@ -1601,19 +1604,19 @@ svgout_c_h = mplibsvg.h mpsvgout.h svgout.c
tfmin_c_h = mptfmin.h tfmin.c
libmplib_web = mplibdir/mp.w mplibdir/psout.w mplibdir/svgout.w \
mplibdir/memio.w mplibdir/tfmin.w
-etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_54)
+etex_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_56)
etex_CFLAGS = $(WARNING_CFLAGS)
# With --enable-ipc, e-TeX may need to link with -lsocket.
-etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_55)
+etex_LDADD = $(LDADD) $(ipc_socketlibs) $(am__append_57)
# e-TeX C sources
etex_c_h = etexini.c etex0.c etexcoerce.h etexd.h
nodist_etex_SOURCES = $(etex_c_h) etex-pool.c etexextra.c \
- etexdir/etexextra.h $(am__append_57)
+ etexdir/etexextra.h $(am__append_59)
# We must create etexd.h before building the etex_OBJECTS.
-etex_prereq = etexd.h $(am__append_56)
+etex_prereq = etexd.h $(am__append_58)
etex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -1694,7 +1697,7 @@ pdftex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(LIBPNG_DEPEND) \
# Force Automake to use CXXLD for linking
nodist_EXTRA_pdftex_SOURCES = dummy.cxx
pdf_tangle = WEBINPUTS=.:$(srcdir)/pdftexdir $(SHELL) ./tangle-sh $@ $(TANGLE)
-pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_58)
+pdftex_CPPFLAGS = $(pdftex_cppflags) $(am__append_60)
pdftex_CFLAGS = $(WARNING_CFLAGS)
pdftex_CXXFLAGS = $(WARNING_CXXFLAGS)
@@ -1703,7 +1706,7 @@ pdftex_LDADD = libpdftex.a $(pdftex_ldadd) $(LDADD) $(ipc_socketlibs)
pdftex_DEPENDENCIES = $(pdftex_dependencies) libpdftex.a
pdftex_c_h = pdftexini.c pdftex0.c pdftexcoerce.h pdftexd.h
nodist_pdftex_SOURCES = $(pdftex_c_h) pdftex-pool.c pdftexextra.c \
- pdftexdir/pdftexextra.h $(am__append_59)
+ pdftexdir/pdftexextra.h $(am__append_61)
pdftex_ch_srcs = \
pdftexdir/pdftex.web \
pdftexdir/tex.ch0 \
@@ -1729,7 +1732,7 @@ libpdftex_a_SOURCES = pdftexdir/avl.c pdftexdir/avl.h \
pdftexdir/writejbig2.c pdftexdir/writejbig2.h \
pdftexdir/writejpg.c pdftexdir/writepng.c pdftexdir/writet1.c \
pdftexdir/writet3.c pdftexdir/writettf.c pdftexdir/writettf.h \
- pdftexdir/writezip.c $(am__append_27)
+ pdftexdir/writezip.c $(am__append_28)
EXTRA_libpdftex_a_SOURCES = pdftexdir/macnames.c \
pdftexdir/regex/regcomp.c pdftexdir/regex/regex_internal.c \
pdftexdir/regex/regex_internal.h pdftexdir/regex/regexec.c
@@ -1768,7 +1771,7 @@ luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luat
# luaTeX Tests
#
luatex_tests = luatexdir/luatex.test
-liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_30)
+liblua51_a_CPPFLAGS = -I$(top_srcdir)/luatexdir/lua51 $(am__append_32)
liblua51_a_CFLAGS = # $(WARNING_CFLAGS)
liblua51_a_SOURCES = \
luatexdir/lua51/lapi.c \
@@ -2199,24 +2202,24 @@ libluatex_a_SOURCES = \
# Force Automake to use CXXLD for linking
nodist_EXTRA_xetex_SOURCES = dummy.cxx
-libxetex = libxetex.a $(am__append_33)
+libxetex = libxetex.a $(am__append_35)
xetex_cppflags = $(AM_CPPFLAGS) -I$(srcdir)/xetexdir $(ICU_INCLUDES) \
- $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_32) \
- $(am__append_34) $(am__append_37) $(ZLIB_INCLUDES)
-xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_35) \
- $(am__append_38) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+ $(FREETYPE2_INCLUDES) $(TECKIT_INCLUDES) $(am__append_34) \
+ $(am__append_36) $(am__append_39) $(ZLIB_INCLUDES)
+xetex_ldadd = $(libxetex) $(ICU_LIBS) $(TECKIT_LIBS) $(am__append_37) \
+ $(am__append_40) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
xetex_dependencies = $(proglib) $(KPATHSEA_DEPEND) $(ICU_DEPEND) \
- $(TECKIT_DEPEND) $(am__append_36) $(am__append_39) \
+ $(TECKIT_DEPEND) $(am__append_38) $(am__append_41) \
$(FREETYPE2_DEPEND) $(ZLIB_DEPEND)
@XETEX_MACOSX_TRUE@xetex_LDFLAGS = -framework Carbon -framework Cocoa -framework QuickTime
-xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_60)
+xetex_CPPFLAGS = $(xetex_cppflags) $(am__append_62)
xetex_CFLAGS = # $(WARNING_CFLAGS)
xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
xetex_prereq = $(libxetex)
xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
nodist_xetex_SOURCES = $(xetex_c_h) xetex_pool.c xetexextra.c \
- xetexdir/xetexextra.h $(am__append_61)
+ xetexdir/xetexextra.h $(am__append_63)
xetex_web_srcs = \
tex.web \
etexdir/etex.ch \
@@ -2246,7 +2249,7 @@ libxetex_a_SOURCES = xetexdir/MathTable.h xetexdir/FontTableCache.cpp \
xetexdir/XeTeX_ext.h xetexdir/XeTeXswap.h xetexdir/cmaps.cpp \
xetexdir/cmaps.h xetexdir/sfnt.h xetexdir/trans.c \
xetexdir/trans.h xetexdir/hz.cpp xetexdir/xetex.h \
- $(am__append_40) $(am__append_41) $(am__append_42)
+ $(am__append_42) $(am__append_43) $(am__append_44)
# We must create xetexd.h etc. before building the libxetex_a_OBJECTS.
libxetex_prereq = xetexd.h $(xetex_dependencies)
@@ -8561,8 +8564,6 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-@LUATEX_FALSE@@MP_FALSE@install-exec-hook:
-@LUATEX_FALSE@@MP_FALSE@uninstall-hook:
clean: clean-recursive
clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \
@@ -8927,13 +8928,6 @@ mpxout-tangle: ctangle$(EXEEXT) mplibdir/mpxout.w tangle-sh
$(mpost_OBJECTS): $(nodist_mpost_SOURCES) libmplib.a
-# Double-colon rules since we do something similar in luatexdir (maybe others).
-@MP_TRUE@install-exec-hook::
-@MP_TRUE@ cd $(DESTDIR)$(bindir) && rm -f dvitomp$(EXEEXT) \
-@MP_TRUE@ && $(LN_S) mpost$(EXEEXT) dvitomp$(EXEEXT)
-@MP_TRUE@uninstall-hook::
-@MP_TRUE@ rm -f $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
-
.PHONY: mptrap-clean
clean-local:: mptrap-clean
mptrap-clean:
@@ -9142,16 +9136,6 @@ $(pdftosrc_OBJECTS): $(ZLIB_DEPEND) $(LIBPNG_DEPEND) $(XPDF_DEPEND) $(OBSDCOMPAT
$(luatex_OBJECTS): libluatex.a
-# Double-colon rules since we do something similar in mplibdir (maybe others).
-@LUATEX_TRUE@install-exec-hook::
-@LUATEX_TRUE@ cd $(DESTDIR)$(bindir) && rm -f texlua$(EXEEXT) \
-@LUATEX_TRUE@ && $(LN_S) luatex$(EXEEXT) texlua$(EXEEXT)
-@LUATEX_TRUE@ cd $(DESTDIR)$(bindir) && rm -f texluac$(EXEEXT) \
-@LUATEX_TRUE@ && $(LN_S) luatex$(EXEEXT) texluac$(EXEEXT)
-@LUATEX_TRUE@uninstall-hook::
-@LUATEX_TRUE@ rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
-@LUATEX_TRUE@ rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
-
$(libluasocket_a_OBJECTS): liblua51.a
$(libluamisc_a_OBJECTS): $(libluamisc_a_DEPENDENCIES)
@@ -9535,6 +9519,24 @@ synctex-pdf.c: pdftexd.h synctexdir/synctex.c $(dist_pdftex_SOURCES)
synctex-xe.c: xetexd.h synctexdir/synctex.c $(dist_xetex_SOURCES)
sed s/TEX-OR-MF-OR-MP/xetex/ $(srcdir)/synctexdir/synctex.c >$@
+# Symlinks within $(bindir): FILE:LINK indicates LINK$(EXEEXT)->FILE$(EXEEXT)
+install-exec-hook:
+ @test -z "$(bin_links)" || { \
+ cd $(DESTDIR)$(bindir) && \
+ for s in $(bin_links); do \
+ link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
+ file=`echo $$s | sed 's,:.*,,'`$(EXEEXT); \
+ rm -f $$link; \
+ echo "creating link '$$link' -> '$$file'"; \
+ $(LN_S) $$file $$link || exit 1; \
+ done; }
+uninstall-hook:
+ @test -z "$(bin_links)" || \
+ for s in $(bin_links); do \
+ link=`echo $$s | sed 's,.*:,,'`$(EXEEXT); \
+ rm -f $(DESTDIR)$(bindir)/$$link; \
+ done
+
# 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:
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 4aaf146866d..e3d612d2b40 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/luatex.am: install-exec-hook and uninstall-hook rules now
+ in ../Makefile.am; append required symlinks to bin_links.
+
2010-09-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* luatex.test (new): Just testing 'luatex -credits'.
diff --git a/Build/source/texk/web2c/luatexdir/am/luatex.am b/Build/source/texk/web2c/luatexdir/am/luatex.am
index d7d37ebed6e..91fd0da9b0c 100644
--- a/Build/source/texk/web2c/luatexdir/am/luatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/luatex.am
@@ -7,6 +7,7 @@
##
if LUATEX
bin_PROGRAMS += luatex
+bin_links += luatex:texlua luatex:texluac
endif LUATEX
EXTRA_PROGRAMS += luatex
@@ -36,18 +37,6 @@ $(luatex_OBJECTS): libluatex.a
luatex_SOURCES = luatexdir/luatex_svnversion.h luatexdir/luatex.c luatexdir/luatex.h
-# Double-colon rules since we do something similar in mplibdir (maybe others).
-if LUATEX
-install-exec-hook::
- cd $(DESTDIR)$(bindir) && rm -f texlua$(EXEEXT) \
- && $(LN_S) luatex$(EXEEXT) texlua$(EXEEXT)
- cd $(DESTDIR)$(bindir) && rm -f texluac$(EXEEXT) \
- && $(LN_S) luatex$(EXEEXT) texluac$(EXEEXT)
-uninstall-hook::
- rm -f $(DESTDIR)$(bindir)/texlua$(EXEEXT)
- rm -f $(DESTDIR)$(bindir)/texluac$(EXEEXT)
-endif LUATEX
-
EXTRA_DIST += luatexdir/ptexlib.h
EXTRA_DIST += luatexdir/getluatexsvnversion.sh
diff --git a/Build/source/texk/web2c/man/ChangeLog b/Build/source/texk/web2c/man/ChangeLog
index 413171c190a..85650b52c57 100644
--- a/Build/source/texk/web2c/man/ChangeLog
+++ b/Build/source/texk/web2c/man/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * Makefile.am (install-data-hook): Check symlink creation.
+
2010-12-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* mpost.man: Define the macro URL (from Taco).
diff --git a/Build/source/texk/web2c/man/Makefile.am b/Build/source/texk/web2c/man/Makefile.am
index c933caf2c72..1c13063df99 100644
--- a/Build/source/texk/web2c/man/Makefile.am
+++ b/Build/source/texk/web2c/man/Makefile.am
@@ -88,7 +88,7 @@ install-data-hook:
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link.1; \
echo "creating link '$$link.1' -> '$$file.1'"; \
- $(LN_S) $$file.1 $$link.1; \
+ $(LN_S) $$file.1 $$link.1 || exit 1; \
done
uninstall-hook:
diff --git a/Build/source/texk/web2c/man/Makefile.in b/Build/source/texk/web2c/man/Makefile.in
index 18c58ba7b1d..bce2a3b42f5 100644
--- a/Build/source/texk/web2c/man/Makefile.in
+++ b/Build/source/texk/web2c/man/Makefile.in
@@ -621,7 +621,7 @@ install-data-hook:
file=`echo $$s | sed 's,:.*,,'`; \
rm -f $$link.1; \
echo "creating link '$$link.1' -> '$$file.1'"; \
- $(LN_S) $$file.1 $$link.1; \
+ $(LN_S) $$file.1 $$link.1 || exit 1; \
done
uninstall-hook:
diff --git a/Build/source/texk/web2c/mplibdir/ChangeLog b/Build/source/texk/web2c/mplibdir/ChangeLog
index e6232f65efd..b388d7d3487 100644
--- a/Build/source/texk/web2c/mplibdir/ChangeLog
+++ b/Build/source/texk/web2c/mplibdir/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/mplib.am: install-exec-hook and uninstall-hook rules now
+ in ../Makefile.am; append required symlink to bin_links.
+
2010-06-11 Taco Hoekwater <taco@luatex.org>
* *.w, lmplib.h: change include of "config.h" to <w2c/config.h>.
diff --git a/Build/source/texk/web2c/mplibdir/am/mplib.am b/Build/source/texk/web2c/mplibdir/am/mplib.am
index ad5a112d54d..1c2bbc630bf 100644
--- a/Build/source/texk/web2c/mplibdir/am/mplib.am
+++ b/Build/source/texk/web2c/mplibdir/am/mplib.am
@@ -7,6 +7,7 @@
##
if MP
bin_PROGRAMS += mpost
+bin_links += mpost:dvitomp
endif MP
EXTRA_PROGRAMS += mpost
@@ -41,15 +42,6 @@ EXTRA_DIST += mplibdir/ChangeLog $(mpost_web)
DISTCLEANFILES += $(nodist_mpost_SOURCES) mpxout-tangle
-# Double-colon rules since we do something similar in luatexdir (maybe others).
-if MP
-install-exec-hook::
- cd $(DESTDIR)$(bindir) && rm -f dvitomp$(EXEEXT) \
- && $(LN_S) mpost$(EXEEXT) dvitomp$(EXEEXT)
-uninstall-hook::
- rm -f $(DESTDIR)$(bindir)/dvitomp$(EXEEXT)
-endif MP
-
## MetaPost Tests
##
mp_tests = mplibdir/dvitomp.test mplibdir/mptrap.test
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 11:21:24 +0000