From 9397bf54a2ddb4e0fe8a73d5f753eee23a10601c Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Thu, 13 Nov 2008 02:38:19 +0100 Subject: [PATCH] Generate yaz-version.h from configure.ac (except YAZ_VERSIONL) --- configure.ac | 2 ++ include/yaz/.gitignore | 1 + include/yaz/Makefile.am | 2 ++ include/yaz/yaz-version.h.in | 4 ++-- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fcc9d14..c282836 100644 --- a/configure.ac +++ b/configure.ac @@ -390,6 +390,7 @@ YAZ_BUILD_ROOT=`pwd` dnl ------ windows version files WIN_FILEVERSION=`echo $PACKAGE_VERSION|tr . ,`.1 +AC_SUBST([WIN_FILEVERSION]) dnl dnl ------ Makefiles dnl @@ -412,6 +413,7 @@ etc/Makefile yaz-config yaz.pc Doxyfile +include/yaz/yaz-version.h ],[ sed s%yaz_echo_source=yes%yaz_echo_source=no%g < yaz-config > util/yaz-config && chmod +x yaz-config util/yaz-config ] diff --git a/include/yaz/.gitignore b/include/yaz/.gitignore index e41989a..674b615 100644 --- a/include/yaz/.gitignore +++ b/include/yaz/.gitignore @@ -10,3 +10,4 @@ diagsrw.h diagsru_update.h oid_std.h oclc-ill-req-ext.h +yaz-version.h diff --git a/include/yaz/Makefile.am b/include/yaz/Makefile.am index 4251deb..054ea2f 100644 --- a/include/yaz/Makefile.am +++ b/include/yaz/Makefile.am @@ -21,3 +21,5 @@ pkginclude_HEADERS= backend.h ccl.h ccl_xml.h cql.h rpn2cql.h comstack.h \ zes-psched.h zes-admin.h zes-pset.h zes-update.h zes-update0.h \ zoom.h z-charneg.h charneg.h soap.h srw.h zgdu.h matchstr.h +EXTRA_DIST = yaz-version.h.in + diff --git a/include/yaz/yaz-version.h.in b/include/yaz/yaz-version.h.in index d5ed578..93d495b 100644 --- a/include/yaz/yaz-version.h.in +++ b/include/yaz/yaz-version.h.in @@ -32,10 +32,10 @@ #include -#define YAZ_VERSION "3.0.38" +#define YAZ_VERSION "@VERSION@" #define YAZ_VERSIONL 0x030026 -#define YAZ_FILEVERSION 3,0,38,1 +#define YAZ_FILEVERSION @WIN_FILEVERSION@ #define YAZ_DATE 1 -- 1.7.10.4