summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/xetexdir
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-19 12:37:36 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-19 12:37:36 +0000
commit4cb5cce939c23bfc8b827e055e083289dd375763 (patch)
tree25c8b0733ccb071630259f4d8dfd2a6744c20521 /Build/source/texk/web2c/xetexdir
parentdafc7ac20f5196fde6017209e1def77281418021 (diff)
*TeX: Distribute the *texdir/*tex_version.h files
git-svn-id: svn://tug.org/texlive/trunk@27087 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c/xetexdir')
-rw-r--r--Build/source/texk/web2c/xetexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/xetexdir/am/xetex.am15
-rw-r--r--Build/source/texk/web2c/xetexdir/xetex_version.h1
-rw-r--r--Build/source/texk/web2c/xetexdir/xetexextra.h2
4 files changed, 11 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/xetexdir/ChangeLog b/Build/source/texk/web2c/xetexdir/ChangeLog
index f979845db31..9867da18c04 100644
--- a/Build/source/texk/web2c/xetexdir/ChangeLog
+++ b/Build/source/texk/web2c/xetexdir/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/xetex.am: Distribute xetex_version.h.
+ * xetexextra.h: Use ../etexdir/etex_version.h.
+
2012-06-25 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* xetex.ch: XeTeX uses 256 math font families.
diff --git a/Build/source/texk/web2c/xetexdir/am/xetex.am b/Build/source/texk/web2c/xetexdir/am/xetex.am
index 6eeb13efb25..90a0a62cd89 100644
--- a/Build/source/texk/web2c/xetexdir/am/xetex.am
+++ b/Build/source/texk/web2c/xetexdir/am/xetex.am
@@ -63,14 +63,13 @@ xetex_CXXFLAGS = # $(WARNING_CXXFLAGS)
xetex_LDADD = $(xetex_ldadd) $(LDADD) $(ipc_socketlibs)
# We must create libxetex.a etc before building the xetex_OBJECTS
-xetex_prereq = $(libxetex) xetexdir/etex_version.h xetexdir/xetex_version.h
+xetex_prereq = $(libxetex) xetexdir/xetex_version.h
$(xetex_OBJECTS): $(xetex_prereq)
## XeTeX C sources
xetex_c_h = xetexini.c xetex0.c xetexcoerce.h xetexd.h
-nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c \
- xetexdir/etex_version.h xetexdir/xetex_version.h
-dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h
+nodist_xetex_SOURCES = $(xetex_c_h) xetex-pool.c
+dist_xetex_SOURCES = xetexdir/xetexextra.c xetexdir/xetexextra.h xetexdir/xetex_version.h
$(xetex_c_h): xetex-web2c
@$(web2c) xetex
@@ -86,14 +85,8 @@ xetex.p xetex.pool: xetex-tangle
xetex-tangle: ./otangle$(EXEEXT) xetex.web tangle-sh
@$(o_tangle) xetex
-## Extract etex version
-xetexdir/etex_version.h: etexdir/etex.ch
- $(MKDIR_P) xetexdir
- grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
-
## Extract xetex version
-xetexdir/xetex_version.h: xetexdir/xetex.ch
+xetexdir/xetex_version.h: xetexdir/xetex.ch etexdir/etex_version.h
$(MKDIR_P) xetexdir
grep '^@d XeTeX_version_string==' $(srcdir)/xetexdir/xetex.ch \
| sed "s/^.*'-/#define XETEX_VERSION \"/;s/'.*$$/\"/" >$@
diff --git a/Build/source/texk/web2c/xetexdir/xetex_version.h b/Build/source/texk/web2c/xetexdir/xetex_version.h
new file mode 100644
index 00000000000..50695ee64c8
--- /dev/null
+++ b/Build/source/texk/web2c/xetexdir/xetex_version.h
@@ -0,0 +1 @@
+#define XETEX_VERSION "0.9998"
diff --git a/Build/source/texk/web2c/xetexdir/xetexextra.h b/Build/source/texk/web2c/xetexdir/xetexextra.h
index 6adccef578e..75b77ce26b2 100644
--- a/Build/source/texk/web2c/xetexdir/xetexextra.h
+++ b/Build/source/texk/web2c/xetexdir/xetexextra.h
@@ -53,7 +53,7 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-#include <xetexdir/etex_version.h> /* for ETEX_VERSION */
+#include <etexdir/etex_version.h> /* for ETEX_VERSION */
#include <xetexdir/xetex_version.h> /* for XETEX_VERSION */
#define BANNER "This is XeTeX, Version 3.1415926-" ETEX_VERSION "-" XETEX_VERSION