summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c/euptexdir
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/texk/web2c/euptexdir')
-rw-r--r--Build/source/texk/web2c/euptexdir/ChangeLog6
-rw-r--r--Build/source/texk/web2c/euptexdir/am/euptex.am37
-rw-r--r--Build/source/texk/web2c/euptexdir/euptexextra.h8
3 files changed, 16 insertions, 35 deletions
diff --git a/Build/source/texk/web2c/euptexdir/ChangeLog b/Build/source/texk/web2c/euptexdir/ChangeLog
index a1baedcfe4a..f1063a5b7cb 100644
--- a/Build/source/texk/web2c/euptexdir/ChangeLog
+++ b/Build/source/texk/web2c/euptexdir/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * euptexextra.h: Use the distributed files
+ ../{ep,e,p,up}texdir/{ep,e,p,up}tex_version.h.
+ * am/euptex.am: Adapted.
+
2012-07-15 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
* euptexextra.c: Must #define DLLPROC before reading euptexd.h.
diff --git a/Build/source/texk/web2c/euptexdir/am/euptex.am b/Build/source/texk/web2c/euptexdir/am/euptex.am
index 62b0e2f036d..584789a98d9 100644
--- a/Build/source/texk/web2c/euptexdir/am/euptex.am
+++ b/Build/source/texk/web2c/euptexdir/am/euptex.am
@@ -1,6 +1,6 @@
## texk/web2c/euptexdir/am/euptex.am: Makefile fragment for e-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.
## e-upTeX
@@ -24,13 +24,12 @@ euptex_DEPENDENCIES = libukanji.a $(pproglib) $(PTEXENC_DEPEND) $(default_depend
# e-upTeX C sources
euptex_c_h = euptexini.c euptex0.c euptexcoerce.h euptexd.h
-nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c euptexdir/etex_version.h \
- euptexdir/eptex_version.h euptexdir/ptex_version.h euptexdir/uptex_version.h
-dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h
+nodist_euptex_SOURCES = $(euptex_c_h) euptex-pool.c
+dist_euptex_SOURCES = euptexdir/euptexextra.c euptexdir/euptexextra.h \
+ eptexdir/eptex_version.h uptexdir/uptex_version.h
-# We must create euptexd.h and euptexdir/*tex_version.h before building the euptex_OBJECTS.
-euptex_prereq = euptexd.h euptexdir/etex_version.h euptexdir/eptex_version.h \
- euptexdir/ptex_version.h euptexdir/uptex_version.h
+# We must create euptexd.h and [eu]ptexdir/[eu]ptex_version.h before building the euptex_OBJECTS.
+euptex_prereq = euptexd.h eptexdir/eptex_version.h uptexdir/uptex_version.h
$(euptex_OBJECTS): $(euptex_prereq)
$(euptex_c_h): euptex-web2c
@@ -47,30 +46,6 @@ euptex.p euptex.pool: euptex-tangle
euptex-tangle: tangle$(EXEEXT) euptex.web euptex.ch tangle-sh
@$(texmf_tangle) euptex euptex
-# Extract etex version
-euptexdir/etex_version.h: etexdir/etex.ch
- $(MKDIR_P) euptexdir
- grep '^@d eTeX_version_string==' $(srcdir)/etexdir/etex.ch \
- | sed "s/^.*'-/#define ETEX_VERSION \"/;s/'.*$$/\"/" >$@
-
-# Extract eptex version
-euptexdir/eptex_version.h: eptexdir/eptex.ech
- $(MKDIR_P) euptexdir
- grep '^@d epTeX_version_string==' $(srcdir)/eptexdir/eptex.ech \
- | sed "s/^.*'-/#define EPTEX_VERSION \"/;s/'.*$$/\"/" >$@
-
-# Extract ptex version
-euptexdir/ptex_version.h: ptexdir/ptex-base.ch
- $(MKDIR_P) euptexdir
- grep '^@d pTeX_version_string==' $(srcdir)/ptexdir/ptex-base.ch \
- | sed "s/^.*'-/#define PTEX_VERSION \"/;s/'.*$$/\"/" >$@
-
-# Extract uptex version
-euptexdir/uptex_version.h: uptexdir/uptex-m.ch
- $(MKDIR_P) euptexdir
- grep '^@d upTeX_version_string==' $(srcdir)/uptexdir/uptex-m.ch \
- | sed "s/^.*'-/#define UPTEX_VERSION \"/;s/'.*$$/\"/" >$@
-
# Generate euptex.web
euptex.web: tie$(EXEEXT) $(euptex_web_srcs)
$(tie) -m euptex.web $(euptex_web_srcs)
diff --git a/Build/source/texk/web2c/euptexdir/euptexextra.h b/Build/source/texk/web2c/euptexdir/euptexextra.h
index 6e9d4071c13..9fa305ba444 100644
--- a/Build/source/texk/web2c/euptexdir/euptexextra.h
+++ b/Build/source/texk/web2c/euptexdir/euptexextra.h
@@ -3,10 +3,10 @@
This is included by e-upTeX, from euptexextra.c
*/
-#include <euptexdir/eptex_version.h> /* for EPTEX_VERSION */
-#include <euptexdir/etex_version.h> /* for ETEX_VERSION */
-#include <euptexdir/ptex_version.h> /* for PTEX_VERSION */
-#include <euptexdir/uptex_version.h> /* for UPTEX_VERSION */
+#include <eptexdir/eptex_version.h> /* for EPTEX_VERSION */
+#include <etexdir/etex_version.h> /* for ETEX_VERSION */
+#include <ptexdir/ptex_version.h> /* for PTEX_VERSION */
+#include <uptexdir/uptex_version.h> /* for UPTEX_VERSION */
#define BANNER "This is e-upTeX, Version 3.1415926-" PTEX_VERSION "-" UPTEX_VERSION "-" EPTEX_VERSION "-" ETEX_VERSION
#define COPYRIGHT_HOLDER "D.E. Knuth"