summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir
diff options
context:
space:
mode:
authorAndreas Scherer <andreas_tex@freenet.de>2020-07-17 13:13:57 +0000
committerAndreas Scherer <andreas_tex@freenet.de>2020-07-17 13:13:57 +0000
commitaa328aa555e4b4370722cdb0476f785aeb6ea0f2 (patch)
tree4a4554fd4bdaa2beccda0baa874ae09aba32a1cd /Build/source/texk/web2c/xetexdir
parente7c4d3cf60345c2a175b219e15fa2515621e6bd7 (diff)
Avoid changefile ambiguity for pdfTeX and XeTeX.
Similar to TeX and Metafont, the 'final' composed changefile will be named such. git-svn-id: svn://tug.org/texlive/trunk@55856 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am12
2 files changed, 10 insertions, 6 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index 933e968cf7d..81b02b0fcfc 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,7 @@
+2020-07-17 Andreas Scherer <https://ascherer.github.io>
+
+ * am/xetex.am: Avoid changefile ambiguity.
+
2020-07-04 Clerk Ma <maqiyuan130324@vip.qq.com>
* xetex.web: Tweak indentation, etc.
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index ec34981a1dd..ddba5f9f10b 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -92,9 +92,9 @@ xetex-pool.c: xetex.pool xetexd.h $(makecpool_stamp)
## Tangling XeTeX
xetex.p xetex.pool: xetex-tangle
- @$(xe_tangle) xetex xetex
-xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex.ch tangle-sh
- @$(xe_tangle) xetex xetex
+ @$(xe_tangle) xetex xetex-final
+xetex-tangle: otangle$(EXEEXT) xetexdir/xetex.web xetex-final.ch tangle-sh
+ @$(xe_tangle) xetex xetex-final
# Extract etex version
$(srcdir)/xetexdir/etex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
@@ -106,8 +106,8 @@ $(srcdir)/xetexdir/xetex_version.h: @MAINTAINER_MODE_TRUE@ xetexdir/xetex.web
$(AM_V_GEN)grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.web \
| sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
-## Generate xetex.ch
-xetex.ch: tie$(EXEEXT) $(xetex_ch_srcs)
+## Generate xetex-final.ch
+xetex-final.ch: tie$(EXEEXT) $(xetex_ch_srcs)
$(tie_c) $(xetex_ch_srcs)
xetex_ch_srcs = \
xetexdir/xetex.web \
@@ -121,7 +121,7 @@ xetex_ch_srcs = \
##
EXTRA_DIST += $(xetex_web_srcs) $(xetex_ch_srcs) xetexdir/xetex.defines
-DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex.ch xetex-web2c \
+DISTCLEANFILES += $(nodist_xetex_SOURCES) xetex.web xetex-final.ch xetex-web2c \
xetex.p xetex.pool xetex-tangle