summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 11:18:21 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2013-06-24 11:18:21 +0000
commitbeb5cd01dc68de7225916fafbd1ff2bb0bb338e5 (patch)
tree091e93b5b1916812aa51f17e6582ecc468d1576e
parent7cb8554d1c7ba5a1c04a9a6016c0516c31ca5961 (diff)
(u)pTeX: Reduce TL vs W32TeX diffs
git-svn-id: svn://tug.org/texlive/trunk@30898 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/ptexdir/ChangeLog8
-rw-r--r--Build/source/texk/web2c/ptexdir/am/ptex.am2
-rw-r--r--Build/source/texk/web2c/ptexdir/kanji.h2
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/uptexdir/kanji.h2
5 files changed, 16 insertions, 2 deletions
diff --git a/Build/source/texk/web2c/ptexdir/ChangeLog b/Build/source/texk/web2c/ptexdir/ChangeLog
index 5bdeb759dad..2ac0a23339b 100644
--- a/Build/source/texk/web2c/ptexdir/ChangeLog
+++ b/Build/source/texk/web2c/ptexdir/ChangeLog
@@ -1,3 +1,11 @@
+2013-06-18 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/ptex.am: Move PTEXENC_RULE to ../Makefile.am.
+
+2013-06-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kanji.h: Avoid redefinition of KANJI.
+
2013-05-05 Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
* ptex-base.ch: Fix a bug that KANJI info of the last char in \hbox
diff --git a/Build/source/texk/web2c/ptexdir/am/ptex.am b/Build/source/texk/web2c/ptexdir/am/ptex.am
index df637935298..9a4659e4035 100644
--- a/Build/source/texk/web2c/ptexdir/am/ptex.am
+++ b/Build/source/texk/web2c/ptexdir/am/ptex.am
@@ -29,8 +29,6 @@ pproglib = lib/libp.a
# Rebuild $(pproglib)
$(pproglib): $(KPATHSEA_DEPEND) ${srcdir}/lib/*.c
cd lib && $(MAKE) $(AM_MAKEFLAGS) libp.a
-## Rebuild libptexenc
-@PTEXENC_RULE@
## libkanji.a for pTeX and e-pTeX
##
diff --git a/Build/source/texk/web2c/ptexdir/kanji.h b/Build/source/texk/web2c/ptexdir/kanji.h
index e4fd2f0bd2b..9c8f43b8601 100644
--- a/Build/source/texk/web2c/ptexdir/kanji.h
+++ b/Build/source/texk/web2c/ptexdir/kanji.h
@@ -11,7 +11,9 @@
#define setintone(w,a) ((w).cint1=(a))
#endif
+#ifndef KANJI
#define KANJI
+#endif
#if !defined(WIN32)
extern int sjisterminal;
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index 894314a29c5..b08858d3921 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-05 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kanji.h: Avoid redefinition of KANJI.
+
2013-04-09 Peter Breitenlohner <peb@mppmu.mpg.de>
* uptrip/uptrip.diffs: Update for TL 2013.
diff --git a/Build/source/texk/web2c/uptexdir/kanji.h b/Build/source/texk/web2c/uptexdir/kanji.h
index a27b22f3c4b..8540869c5c7 100644
--- a/Build/source/texk/web2c/uptexdir/kanji.h
+++ b/Build/source/texk/web2c/uptexdir/kanji.h
@@ -11,7 +11,9 @@
#define setintone(w,a) ((w).cint1=(a))
#endif
+#ifndef KANJI
#define KANJI
+#endif
#if !defined(WIN32)
extern int sjisterminal;