diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-04-16 13:41:48 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-04-16 13:41:48 +0000 |
commit | b517e15e9fb22ebb6d36127ff64470f8a00309d0 (patch) | |
tree | af53263115d70f4a420fc95c6c9b2228a701d6b1 /Build/source/texk/kpathsea/win32 | |
parent | 075862c5ff18610119538267c9b817d21d767780 (diff) |
kpathsea: Minor build fix and clean up
git-svn-id: svn://tug.org/texlive/trunk@25986 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea/win32')
-rw-r--r-- | Build/source/texk/kpathsea/win32/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/win32/Makefile.am | 5 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/win32/Makefile.in | 7 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/win32/mktexpk.c | 7 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/win32/mktextfm.c | 7 |
5 files changed, 18 insertions, 14 deletions
diff --git a/Build/source/texk/kpathsea/win32/ChangeLog b/Build/source/texk/kpathsea/win32/ChangeLog index e9395b5bce9..87391e2e45c 100644 --- a/Build/source/texk/kpathsea/win32/ChangeLog +++ b/Build/source/texk/kpathsea/win32/ChangeLog @@ -1,3 +1,9 @@ +2012-04-09 Peter Breitenlohner <peb@mppmu.mpg.de> + + * Makefile.am (AM_CPPFLAGS): Define WEB2C_KPSE_VERSION. + * mktexpk.c, mktextfm.c: Drop WINWEB2CVERSION, WINKPSEVERSION, + use WEB2C_KPSE_VERSION with versions from configure. + 2011-08-29 Peter Breitenlohner <peb@mppmu.mpg.de> * fmtutil.c: Add parens around assignment used as truth value. diff --git a/Build/source/texk/kpathsea/win32/Makefile.am b/Build/source/texk/kpathsea/win32/Makefile.am index 3f5cfc9d35c..1e0614ac519 100644 --- a/Build/source/texk/kpathsea/win32/Makefile.am +++ b/Build/source/texk/kpathsea/win32/Makefile.am @@ -1,9 +1,10 @@ ## Makefile.am for the TeX Live subdirectory texk/dviljk/win32/ ## -## 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. ## -AM_CPPFLAGS = -I$(top_builddir)/.. -I$(top_srcdir)/.. +INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/.. +AM_CPPFLAGS = -DWEB2C_KPSE_VERSION='"Web2C-$(WEB2CVERSION) Kpathsea-$(KPSEVERSION)"' 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 1b0da7e023a..b91cb047ab3 100644 --- a/Build/source/texk/kpathsea/win32/Makefile.in +++ b/Build/source/texk/kpathsea/win32/Makefile.in @@ -67,7 +67,8 @@ am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ $(top_srcdir)/../../m4/ltsugar.m4 \ $(top_srcdir)/../../m4/ltversion.m4 \ $(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \ - $(top_srcdir)/ac/mktex.ac $(top_srcdir)/configure.ac + $(top_srcdir)/../../version.ac $(top_srcdir)/ac/mktex.ac \ + $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(install_sh) -d @@ -202,6 +203,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@ @@ -254,7 +256,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)/.. +INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/.. +AM_CPPFLAGS = -DWEB2C_KPSE_VERSION='"Web2C-$(WEB2CVERSION) Kpathsea-$(KPSEVERSION)"' AM_CFLAGS = $(WARNING_CFLAGS) fmtutil_SOURCES = \ dirutil.c \ diff --git a/Build/source/texk/kpathsea/win32/mktexpk.c b/Build/source/texk/kpathsea/win32/mktexpk.c index e4f23087644..e4bd7c3e5e2 100644 --- a/Build/source/texk/kpathsea/win32/mktexpk.c +++ b/Build/source/texk/kpathsea/win32/mktexpk.c @@ -33,9 +33,6 @@ #include "getdestdir.h" #include "mktexupd.h" -#define WINWEB2CVERSION "Web2C-2011" -#define WINKPSEVERSION " Kpathsea-6.0.1" - #define LLBUF 1024 #define LBUF 512 #define SBUF 256 @@ -118,8 +115,8 @@ skipchar(char **p) static void version (void) { - fprintf (stderr, "%s, (C version 1.5 --ak 2006-2011)\n", progname); - fprintf (stderr, WINWEB2CVERSION WINKPSEVERSION "\n"); + fprintf (stderr, "%s, (C version 1.5 --ak 2006-2012)\n", progname); + fprintf (stderr, WEB2C_KPSE_VERSION "\n"); } static void diff --git a/Build/source/texk/kpathsea/win32/mktextfm.c b/Build/source/texk/kpathsea/win32/mktextfm.c index 14ef9526b85..a418f4b339f 100644 --- a/Build/source/texk/kpathsea/win32/mktextfm.c +++ b/Build/source/texk/kpathsea/win32/mktextfm.c @@ -7,9 +7,6 @@ * change current dir to tmp. */ -#define WINWEB2CVERSION "Web2C-2011" -#define WINKPSEVERSION " Kpathsea-6.0.1" - #include <kpathsea/kpathsea.h> #include "dirutil.h" @@ -32,8 +29,8 @@ usage (void) static void version (void) { - fprintf (stderr, "%s, (C version 1.4 --ak 2009-2011)\n", progname); - fprintf (stderr, WINWEB2CVERSION WINKPSEVERSION "\n"); + fprintf (stderr, "%s, (C version 1.4 --ak 2009-2012)\n", progname); + fprintf (stderr, WEB2C_KPSE_VERSION "\n"); return; } |