fix version suffix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10690 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 7312135c619f4d64add0734a6896330575b6789d..e84cbefabdb4a150cfa632f63b4820a1751d7e3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-30  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * configure.ac: fix version-suffix
+
 2005-12-28  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * autogen.sh: require automake 1.9

diff --git a/configure.ac b/configure.ac
index 44e36a56e27506304174dadf032a6736383ee94d..fa1ed87bb9697d263605524cdeb3e108554d6252 100644 (file)
--- 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 36416579ca0461f6bac7d43b38984ee8bf6a3979..85313927c06d361c9c158ab06524d4943d096278 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-30  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
+
+       * version.C.in: Use PACKAGE_VERSION instead of VERSION
+
 2005-12-29  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * tabular.C (toggleFixedWidth): Use default layout of text class

diff --git a/src/version.C.in b/src/version.C.in
index e6187f6e031682f508ae2e93ec2282789707f645..7e5e469e8d874392b274a7a51c8295fddf251cea 100644 (file)
--- 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";