>>>>> "Jean-Marc" == Jean-Marc Lasgouttes <[EMAIL PROTECTED]> writes:
Jean-Marc> PS: I did not test bug2237-3.diff, I am currently compiling
It did not work very well, here is an updated version. I'd like to
apply that, if OSX and Windows people can comment on it.
On OSX, it installs in /Application/LyX-1.4.0cvs/ when version suffix
is -1.4.0cvs. Is that a good idea?
JMarc
Index: configure.ac
===================================================================
--- configure.ac (revision 13205)
+++ configure.ac (working copy)
@@ -9,6 +9,7 @@
# First check the version
LYX_CHECK_VERSION
+LYX_VERSION_SUFFIX
AC_CANONICAL_TARGET
dnl default maintainer mode to true for development versions
@@ -21,9 +22,8 @@
# 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.
+# AM_INIT_AUTOMAKE above because we alter $PACKAGE in LYX_USE_PACKAGING.
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
### Set the execute permissions of the various scripts correctly
Index: ChangeLog
===================================================================
--- ChangeLog (revision 13205)
+++ ChangeLog (working copy)
@@ -1,5 +1,9 @@
-2006-01-26 <[EMAIL PROTECTED]>
+2006-02-07 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+ * configure.ac: call LYX_VERSION_SUFFIX earlier (bug 2237).
+
+2006-01-26 Lars Gullik Bjonnes <[EMAIL PROTECTED]>
+
* autogen.sh: remove the --force-missing option to automake
2006-01-25 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
Index: config/ChangeLog
===================================================================
--- config/ChangeLog (revision 13205)
+++ config/ChangeLog (working copy)
@@ -1,5 +1,10 @@
-2006-01-26 Lars Gullik Bjønne s<[EMAIL PROTECTED]>
+2006-02-07 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+ * lyxinclude.m4 (LYX_VERSION_SUFFIX): do not alter PACKAGE here.
+ (LYX_USE_PACKAGING): add $program_suffix to PACKAGE (bug 2237).
+
+2006-01-26 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
+
* ltmain.sh: apply patch for darwin
2005-12-30 Lars Gullik Bjonnes <[EMAIL PROTECTED]>
Index: config/lyxinclude.m4
===================================================================
--- config/lyxinclude.m4 (revision 13205)
+++ config/lyxinclude.m4 (working copy)
@@ -7,7 +7,7 @@
dnl Usage LYX_CHECK_VERSION Displays version of LyX being built and
dnl sets variables "lyx_devel_version" and "lyx_prerelease"
AC_DEFUN([LYX_CHECK_VERSION],[
-echo "configuring LyX version $VERSION"
+echo "configuring LyX version" AC_PACKAGE_VERSION
if echo AC_PACKAGE_VERSION | grep 'cvs' >/dev/null ; then
lyx_devel_version=yes
AC_DEFINE(DEVEL_VERSION, 1, [Define if you are building a development version of LyX])
@@ -28,20 +28,19 @@
dnl
dnl
AC_DEFUN([LYX_VERSION_SUFFIX],[
-AC_MSG_CHECKING([for install target])
+AC_MSG_CHECKING([for version suffix])
RPM_VERSION_SUFFIX='""'
AC_ARG_WITH(version-suffix,
[ --with-version-suffix[=<version>] install lyx files as lyx<version>],
[if test "x$withval" = "xyes";
then
- withval="-$VERSION"
+ withval="-"AC_PACKAGE_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([$withval])
])
@@ -586,21 +585,21 @@
AC_MSG_RESULT($lyx_use_packaging)
case $lyx_use_packaging in
macosx) AC_DEFINE(USE_MACOSX_PACKAGING, 1, [Define to 1 if LyX should use a MacOS X application bundle file layout])
- PACKAGE=LyX
- default_prefix="/Applications/LyX.app"
+ PACKAGE=LyX${program_suffix}
+ default_prefix="/Applications/${PACKAGE}.app"
bindir='${prefix}/Contents/MacOS'
libdir='${prefix}/Contents/Resources'
datadir='${prefix}/Contents/Resources'
mandir='${prefix}/Contents/Resources/man' ;;
windows) AC_DEFINE(USE_WINDOWS_PACKAGING, 1, [Define to 1 if LyX should use a Windows-style file layout])
- PACKAGE=LyX
- default_prefix="C:/Program Files/LyX"
+ PACKAGE=LyX${program_suffix}
+ default_prefix="C:/Program Files/${PACKAGE}"
bindir='${prefix}/bin'
libdir='${prefix}/Resources'
datadir='${prefix}/Resources'
mandir='${prefix}/Resources/man' ;;
posix) AC_DEFINE(USE_POSIX_PACKAGING, 1, [Define to 1 if LyX should use a POSIX-style file layout])
- PACKAGE=lyx
+ PACKAGE=lyx${program_suffix}
default_prefix=$ac_default_prefix ;;
*) LYX_ERROR([Unknown packaging type $lyx_use_packaging]) ;;
esac
