summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-22 10:14:46 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-22 10:14:46 +0000
commitbb13d1bee7a75a6beab8611c2a6f12579546d499 (patch)
tree8d226b090eef543448216a727e296f427c7a9ad7 /Build/source
parentad9162c2dd9e3eb81dc1651130427a2c289dd847 (diff)
fix luatex dependencies, somewhat streamline web2c/convert
git-svn-id: svn://tug.org/texlive/trunk@12787 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/texk/web2c/Makefile.in2
-rw-r--r--Build/source/texk/web2c/luatexdir/am/libluatex.am2
-rw-r--r--Build/source/texk/web2c/web2c/ChangeLog5
-rwxr-xr-xBuild/source/texk/web2c/web2c/convert3
4 files changed, 8 insertions, 4 deletions
diff --git a/Build/source/texk/web2c/Makefile.in b/Build/source/texk/web2c/Makefile.in
index 3bca8b333e3..01f95c07c05 100644
--- a/Build/source/texk/web2c/Makefile.in
+++ b/Build/source/texk/web2c/Makefile.in
@@ -8230,7 +8230,7 @@ $(libluamisc_a_OBJECTS): libluasocket.a
$(libff_a_OBJECTS): libluamisc.a
-$(libluatex_a_OBJECTS): libff.a $(luatex_c_h)
+$(libluatex_a_OBJECTS): libff.a $(nodist_luatex_SOURCES)
$(libluatex_a_OBJECTS): libff.a
diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am
index c5a85a8483c..6c34d554348 100644
--- a/Build/source/texk/web2c/luatexdir/am/libluatex.am
+++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am
@@ -6,7 +6,7 @@ EXTRA_LIBRARIES += libluatex.a
libluatex_a_DEPENDENCIES = libff.a
-$(libluatex_a_OBJECTS): libff.a $(luatex_c_h)
+$(libluatex_a_OBJECTS): libff.a $(nodist_luatex_SOURCES)
libluatex_a_CPPFLAGS = $(ZLIB_INCLUDES) $(LIBPNG_INCLUDES) $(XPDF_INCLUDES)
libluatex_a_CPPFLAGS += $(OBSDCOMPAT_INCLUDES) -I$(srcdir)/libmd5
diff --git a/Build/source/texk/web2c/web2c/ChangeLog b/Build/source/texk/web2c/web2c/ChangeLog
index 4c6aafa2047..242f78e8f96 100644
--- a/Build/source/texk/web2c/web2c/ChangeLog
+++ b/Build/source/texk/web2c/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * convert: use output redirection ('>>') to append the contents
+ of web2c/coerce.h to the generated ${basefile}coerce.h.
+
2009-04-14 Peter Breitenlohner <peb@mppmu.mpg.de>
* convert: use ${basefile}coerce.hx, not x${basefile}coerce.h
diff --git a/Build/source/texk/web2c/web2c/convert b/Build/source/texk/web2c/web2c/convert
index 38f350ada57..545aca8c96e 100755
--- a/Build/source/texk/web2c/web2c/convert
+++ b/Build/source/texk/web2c/web2c/convert
@@ -148,8 +148,7 @@ case $basefile in
;;
tex|etex|luatex|pdftex|aleph|mf|mp|xetex)
sleep 2 # so timestamps are definitely later, to avoid make weirdness
- cat ${basefile}coerce.h $srcdir/web2c/coerce.h >${basefile}coerce.hx
- mv ${basefile}coerce.hx ${basefile}coerce.h
+ cat $srcdir/web2c/coerce.h >>${basefile}coerce.h
touch ${basefile}d.h
;;
esac