This patch seems to work correctly in my tests. I am not sure what
happens in windows though (due to the use of $(EXE_EXT)).
Please test.
JMarc
Index: configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.76
diff -u -p -r1.76 configure.ac
--- configure.ac 29 Jan 2006 16:47:23 -0000 1.76
+++ configure.ac 6 Feb 2006 11:56:57 -0000
@@ -9,6 +9,7 @@ AC_CONFIG_AUX_DIR(config)
# First check the version
LYX_CHECK_VERSION
+LYX_VERSION_SUFFIX
AC_CANONICAL_TARGET
dnl default maintainer mode to true for development versions
@@ -21,7 +22,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2 tar
# Check how the files should be packaged
LYX_USE_PACKAGING
-LYX_VERSION_SUFFIX
+PACKAGE="$PACKAGE${program_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])
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.118
diff -u -p -r1.118 lyxinclude.m4
--- config/lyxinclude.m4 23 Dec 2005 18:16:18 -0000 1.118
+++ config/lyxinclude.m4 6 Feb 2006 11:56:57 -0000
@@ -37,11 +37,10 @@ AC_ARG_WITH(version-suffix,
withval="-$VERSION"
ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
fi
- PACKAGE="$PACKAGE$withval"
program_suffix=$withval
RPM_VERSION_SUFFIX="--with-version-suffix=$withval"])
AC_SUBST(RPM_VERSION_SUFFIX)
-AC_MSG_RESULT([$PACKAGE])
+AC_MSG_RESULT([$PACKAGE$withval])
])
