summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-18 11:33:58 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-06-18 11:33:58 +0000
commitb898efe401e97205d56af3afd1d4c75bc5ef7f39 (patch)
treeefa22ee174aef6f5ca138f1caf0faef29194396e
parent973cc50127fd0835fbbd57bbb9dd8885c60e154d (diff)
Build fix for WIN32 versions of mktex*
git-svn-id: svn://tug.org/texlive/trunk@37598 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/kpathsea/Makefile.in1
-rw-r--r--Build/source/texk/kpathsea/c-auto.in3
-rwxr-xr-xBuild/source/texk/kpathsea/configure4
-rw-r--r--Build/source/texk/kpathsea/configure.ac3
-rw-r--r--Build/source/texk/kpathsea/doc/Makefile.in1
-rw-r--r--Build/source/texk/kpathsea/man/Makefile.in1
-rw-r--r--Build/source/texk/kpathsea/win32/ChangeLog2
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.am1
-rw-r--r--Build/source/texk/kpathsea/win32/Makefile.in4
9 files changed, 11 insertions, 9 deletions
diff --git a/Build/source/texk/kpathsea/Makefile.in b/Build/source/texk/kpathsea/Makefile.in
index c971f22503c..24556754826 100644
--- a/Build/source/texk/kpathsea/Makefile.in
+++ b/Build/source/texk/kpathsea/Makefile.in
@@ -639,6 +639,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/kpathsea/c-auto.in b/Build/source/texk/kpathsea/c-auto.in
index a8dfb4aefdc..8029626515c 100644
--- a/Build/source/texk/kpathsea/c-auto.in
+++ b/Build/source/texk/kpathsea/c-auto.in
@@ -194,9 +194,6 @@
/* Version number of package */
#undef VERSION
-/* Define to the current TeX Live version string. */
-#undef WEB2CVERSION
-
/* Define to 1 if we need (v)snprintf wrapper functions. */
#undef WRAP_SNPRINTF
diff --git a/Build/source/texk/kpathsea/configure b/Build/source/texk/kpathsea/configure
index 1e0cfa0d320..7ca877fb6c9 100755
--- a/Build/source/texk/kpathsea/configure
+++ b/Build/source/texk/kpathsea/configure
@@ -723,6 +723,7 @@ am__isrc
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
+WEB2CVERSION
KPSE_LT_VERSINFO
KPSEVERSION
target_alias
@@ -2763,8 +2764,7 @@ KPSE_LT_VERSINFO=8:2:2
-
-$as_echo "#define WEB2CVERSION \" (TeX Live 2016/dev)\"" >>confdefs.h
+ WEB2CVERSION=" (TeX Live 2016/dev)"
am__api_version='1.15'
diff --git a/Build/source/texk/kpathsea/configure.ac b/Build/source/texk/kpathsea/configure.ac
index 28ed24d85f4..f244058ec37 100644
--- a/Build/source/texk/kpathsea/configure.ac
+++ b/Build/source/texk/kpathsea/configure.ac
@@ -17,8 +17,7 @@ AC_SUBST([KPSEVERSION], [kpse_version])
KPSE_LT_VERSION([kpse])
m4_include([../../version.ac])[] dnl define tex_live_version
-AC_DEFINE([WEB2CVERSION], [" (TeX Live tex_live_version)"],
- [Define to the current TeX Live version string.])
+AC_SUBST([WEB2CVERSION], [" (TeX Live tex_live_version)"])
dnl Common code for all programs using libkpathsea.
KPSE_COMMON([kpathsea])
diff --git a/Build/source/texk/kpathsea/doc/Makefile.in b/Build/source/texk/kpathsea/doc/Makefile.in
index 4828ae2ae60..dfe9f58d02d 100644
--- a/Build/source/texk/kpathsea/doc/Makefile.in
+++ b/Build/source/texk/kpathsea/doc/Makefile.in
@@ -269,6 +269,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/kpathsea/man/Makefile.in b/Build/source/texk/kpathsea/man/Makefile.in
index d5be4eac784..f4e51cd29c1 100644
--- a/Build/source/texk/kpathsea/man/Makefile.in
+++ b/Build/source/texk/kpathsea/man/Makefile.in
@@ -231,6 +231,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog
index 74b858b73ab..b63e5da113d 100644
--- a/Build/source/texk/kpathsea/win32/ChangeLog
+++ b/Build/source/texk/kpathsea/win32/ChangeLog
@@ -1,6 +1,6 @@
2015-06-18 Peter Breitenlohner <peb@mppmu.mpg.de>
- * Makefile.am (AM_CPPFLAGS): Drop WEB2C_KPSE_VERSION.
+ * Makefile.am (AM_CPPFLAGS): WEB2C_KPSE_VERSION => WEB2CVERSION.
* dirutil.[ch], getdestdir.h, mktexupd.h: Add W32TeX Copyright.
* getdestdir.c, mktexfmt.c, mktexlsr.c, mktexmf.c, mktexupd.c,
mktexupdmain.c: Sync with W32TeX.
diff --git a/Build/source/texk/kpathsea/win32/Makefile.am b/Build/source/texk/kpathsea/win32/Makefile.am
index 875e2f61081..7c43878a6df 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.am
+++ b/Build/source/texk/kpathsea/win32/Makefile.am
@@ -4,6 +4,7 @@
## You may freely use, modify and/or distribute this file.
##
AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CPPFLAGS += -DWEB2CVERSION='"$(WEB2CVERSION)"'
AM_CFLAGS = $(WARNING_CFLAGS)
# Build WIN32 replacements for Unix shell scripts.
diff --git a/Build/source/texk/kpathsea/win32/Makefile.in b/Build/source/texk/kpathsea/win32/Makefile.in
index 8b49202aa31..d3c08ce9f44 100644
--- a/Build/source/texk/kpathsea/win32/Makefile.in
+++ b/Build/source/texk/kpathsea/win32/Makefile.in
@@ -279,6 +279,7 @@ SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
WARNING_CFLAGS = @WARNING_CFLAGS@
+WEB2CVERSION = @WEB2CVERSION@
abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
@@ -331,7 +332,8 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/..
+AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/.. \
+ -DWEB2CVERSION='"$(WEB2CVERSION)"'
AM_CFLAGS = $(WARNING_CFLAGS)
mktexfmt_SOURCES = \
mktexfmt.c