summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/uptexdir
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/uptexdir
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/uptexdir')
-rw-r--r--Build/source/texk/web2c/uptexdir/ChangeLog5
-rw-r--r--Build/source/texk/web2c/uptexdir/am/uptex.am18
-rw-r--r--Build/source/texk/web2c/uptexdir/uptex_version.h1
-rw-r--r--Build/source/texk/web2c/uptexdir/uptexextra.h2
4 files changed, 13 insertions, 13 deletions
diff --git a/Build/source/texk/web2c/uptexdir/ChangeLog b/Build/source/texk/web2c/uptexdir/ChangeLog
index cd0fe9635e3..1c5d907ce4d 100644
--- a/Build/source/texk/web2c/uptexdir/ChangeLog
+++ b/Build/source/texk/web2c/uptexdir/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * am/uptex.am: Distribute uptex_version.h.
+ * uptexextra.h: Use ../ptexdir/ptex_version.h.
+
2012-07-15 Peter Breitenlohner <peb@mppmu.mpg.de>
* upbibtex.ch, updvitype.ch, uppltotf.ch, uptftopl.ch:
diff --git a/Build/source/texk/web2c/uptexdir/am/uptex.am b/Build/source/texk/web2c/uptexdir/am/uptex.am
index af5f328991f..ee43eb2bcb6 100644
--- a/Build/source/texk/web2c/uptexdir/am/uptex.am
+++ b/Build/source/texk/web2c/uptexdir/am/uptex.am
@@ -1,6 +1,6 @@
## texk/web2c/uptexdir/am/uptex.am: Makefile fragment for upTeX.
##
-## Copyright (C) 2011 Peter Breitenlohner <tex-live@tug.org>
+## Copyright (C) 2011, 2012 Peter Breitenlohner <tex-live@tug.org>
## You may freely use, modify and/or distribute this file.
uptex_cppflags = $(PTEXENC_INCLUDES) $(AM_CPPFLAGS)
@@ -46,11 +46,11 @@ uptex_DEPENDENCIES = $(uptex_dependencies)
# upTeX C sources
uptex_c_h = uptexini.c uptex0.c uptexcoerce.h uptexd.h
-nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c uptexdir/ptex_version.h uptexdir/uptex_version.h
-dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h
+nodist_uptex_SOURCES = $(uptex_c_h) uptex-pool.c
+dist_uptex_SOURCES = uptexdir/uptexextra.c uptexdir/uptexextra.h uptexdir/uptex_version.h
-# We must create uptexd.h and uptexdir/*ptex_version.h before building the uptex_OBJECTS.
-uptex_prereq = uptexd.h uptexdir/ptex_version.h uptexdir/uptex_version.h
+# We must create uptexd.h and uptexdir/uptex_version.h before building the uptex_OBJECTS.
+uptex_prereq = uptexd.h uptexdir/uptex_version.h
$(uptex_OBJECTS): $(uptex_prereq)
$(uptex_c_h): uptex-web2c
@@ -67,14 +67,8 @@ uptex.p uptex.pool: uptex-tangle
uptex-tangle: tangle$(EXEEXT) uptex.web uptex.ch tangle-sh
@$(texmf_tangle) uptex uptex
-# Extract ptex version
-uptexdir/ptex_version.h: ptexdir/ptex-base.ch
- $(MKDIR_P) uptexdir
- grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
- | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
-
# Extract uptex version
-uptexdir/uptex_version.h: uptexdir/uptex-m.ch
+uptexdir/uptex_version.h: uptexdir/uptex-m.ch ptexdir/ptex_version.h
$(MKDIR_P) uptexdir
grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
| sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
diff --git a/Build/source/texk/web2c/uptexdir/uptex_version.h b/Build/source/texk/web2c/uptexdir/uptex_version.h
new file mode 100644
index 00000000000..3befc4d32dd
--- /dev/null
+++ b/Build/source/texk/web2c/uptexdir/uptex_version.h
@@ -0,0 +1 @@
+#define UPTEX_VERSION "u1.10"
diff --git a/Build/source/texk/web2c/uptexdir/uptexextra.h b/Build/source/texk/web2c/uptexdir/uptexextra.h
index 833a82ce3b9..63d72b85f49 100644
--- a/Build/source/texk/web2c/uptexdir/uptexextra.h
+++ b/Build/source/texk/web2c/uptexdir/uptexextra.h
@@ -3,7 +3,7 @@
This is included by upTeX, from uptexextra.c
*/
-#include <uptexdir/ptex_version.h> /* for PTEX_VERSION */
+#include <ptexdir/ptex_version.h> /* for PTEX_VERSION */
#include <uptexdir/uptex_version.h> /* for UPTEX_VERSION */
#define BANNER "This is upTeX, Version 3.1415926-" PTEX_VERSION "-" UPTEX_VERSION