Georg Baum <[EMAIL PROTECTED]> writes:
| Index: ChangeLog
| ===================================================================
| RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
| retrieving revision 1.1040
| diff -u -p -r1.1040 ChangeLog
| --- ChangeLog 28 Dec 2005 10:47:00 -0000 1.1040
| +++ ChangeLog 30 Dec 2005 11:37:35 -0000
| @@ -1,3 +1,7 @@
| +2005-12-29 Georg Baum <[EMAIL PROTECTED]>
| +
| + * configure.ac: fix version-suffix
| +
| 2005-12-28 Georg Baum <[EMAIL PROTECTED]>
|
| * autogen.sh: require automake 1.9
| Index: configure.ac
| ===================================================================
| RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
| retrieving revision 1.72
| diff -u -p -r1.72 configure.ac
| --- configure.ac 28 Dec 2005 10:47:00 -0000 1.72
| +++ configure.ac 30 Dec 2005 11:37:35 -0000
| @@ -11,17 +11,21 @@ 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])
| +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])
Ok not bad. (tiny bit ugly, but we can live with it.)
I'd like to get rid of the VERSOIN variable though, and use
PACKAGE_VERSION instead. (what AC_INIT defines)
VERSION should not be used in a lot of places...
--
Lgb
