From 544ef3b0dc74f74a5cfacae5878b35c309478413 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Fri, 30 Dec 2005 13:46:09 +0000 Subject: [PATCH] fix version suffix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10690 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 4 ++++ configure.ac | 13 ++++++++----- src/ChangeLog | 4 ++++ src/version.C.in | 2 +- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7312135c61..e84cbefabd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-12-30 Georg Baum + + * configure.ac: fix version-suffix + 2005-12-28 Georg Baum * autogen.sh: require automake 1.9 diff --git a/configure.ac b/configure.ac index 44e36a56e2..fa1ed87bb9 100644 --- a/configure.ac +++ b/configure.ac @@ -11,17 +11,20 @@ AC_CONFIG_AUX_DIR(config) LYX_CHECK_VERSION AC_CANONICAL_TARGET -# Check how the files should be packaged -LYX_USE_PACKAGING -LYX_VERSION_SUFFIX - dnl default maintainer mode to true for development versions if test "${enable_maintainer_mode+set}" != set; then enable_maintainer_mode=$lyx_devel_version fi AM_MAINTAINER_MODE -AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar 1.9]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 tar-ustar no-define 1.9]) + +# Check how the files should be packaged +LYX_USE_PACKAGING +LYX_VERSION_SUFFIX +# We need to define these variables here and the no-define option of +# AM_INIT_AUTOMAKE above because LYX_VERSION_SUFFIX alters $PACKAGE. +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ### Set the execute permissions of the various scripts correctly for file in config/install-sh config/mkinstalldirs lib/configure ; do diff --git a/src/ChangeLog b/src/ChangeLog index 36416579ca..85313927c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2005-12-30 Georg Baum + + * version.C.in: Use PACKAGE_VERSION instead of VERSION + 2005-12-29 Georg Baum * tabular.C (toggleFixedWidth): Use default layout of text class diff --git a/src/version.C.in b/src/version.C.in index e6187f6e03..7e5e469e8d 100644 --- a/src/version.C.in +++ b/src/version.C.in @@ -13,7 +13,7 @@ */ /// -char const * lyx_version = "@VERSION@"; +char const * lyx_version = "@PACKAGE_VERSION@"; /// char const * lyx_release_date = "Thu, Jan 30, 2003"; -- 2.39.2