John's --with-version-suffix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1670 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2001-03-05 11:54:00 +00:00
parent 471b781ff3
commit cf1ce89d7c
5 changed files with 24 additions and 14 deletions

View File

@ -1,3 +1,9 @@
2001-03-02 John Levon <moz@compsoc.man.ac.uk>
* configure.in:
* config/lyxinclude.m4:
* INSTALL: minor changes, become --with-version-suffix
2001-02-23 John Levon <moz@compsoc.man.ac.uk> 2001-02-23 John Levon <moz@compsoc.man.ac.uk>
* configure.in: * configure.in:

View File

@ -122,14 +122,14 @@ flags:
--with-extra-lib=DIRECTORY/lib --with-extra-inc=DIRECTORY/include --with-extra-lib=DIRECTORY/lib --with-extra-inc=DIRECTORY/include
If DIRECTORY is not specified, the current prefix is used. If DIRECTORY is not specified, the current prefix is used.
o --with-lyx-version will install LyX as lyx-<version>, e.g. lyx-1.1.6 o --with-version-suffix will install LyX as lyx-<version>, e.g. lyx-1.2.0
The LyX data directory will be something like <whatever>/lyx-1.1.6/. The LyX data directory will be something like <whatever>/lyx-1.2.0/.
Additionally your user configuration files will be found in e.g. Additionally your user configuration files will be found in e.g.
$HOME/.lyx-1.1.6 $HOME/.lyx-1.2.0
You can use this feature to install more than one version of LyX on You can use this feature to install more than one version of LyX on
the same system. You can optionally specify a "version" of your own, the same system. You can optionally specify a "version" of your own,
by doing something like : ./configure --with-lyx-version=latestcvs by doing something like : ./configure --with-version-suffix=-latestcvs
There are also flags to control the internationalization support in There are also flags to control the internationalization support in
LyX: LyX:

View File

@ -37,15 +37,15 @@ dnl
dnl dnl
AC_DEFUN(LYX_VERSION_SUFFIX,[ AC_DEFUN(LYX_VERSION_SUFFIX,[
AC_MSG_CHECKING([for install target ... ]) AC_MSG_CHECKING([for install target ... ])
AC_ARG_WITH(lyx-version, AC_ARG_WITH(version-suffix,
[ --with-lyx-version[=<version>] install lyx files as lyx-<suffix>], [ --with-version-suffix[=<version>] install lyx files as lyx<version>],
[if test "x$withval" = "xyes"; [if test "x$withval" = "xyes";
then then
withval="$VERSION" withval="-$VERSION"
ac_configure_args=`echo $ac_configure_args | sed "s,--with-lyx-version,--with-lyx-version=$withval,"` ac_configure_args=`echo $ac_configure_args | sed "s,--with-version-suffix,--with-version-suffix=$withval,"`
fi fi
lyxname="lyx-$withval" lyxname="lyx$withval"
program_suffix=-$withval], program_suffix=$withval],
[lyxname=lyx]) [lyxname=lyx])
AC_MSG_RESULT([$lyxname]) AC_MSG_RESULT([$lyxname])
]) ])

View File

@ -1,3 +1,7 @@
2001-03-02 John Levon <moz@compsoc.man.ac.uk>
* reLyX/configure.in: become --with-version-suffix
2001-03-05 Adrien Rebollo <Adrien.Rebollo@wanadoo.fr> 2001-03-05 Adrien Rebollo <Adrien.Rebollo@wanadoo.fr>
* examples/fr_*: renamed french example files in french. * examples/fr_*: renamed french example files in french.

View File

@ -6,10 +6,10 @@ AC_CONFIG_AUX_DIR(../../config)
dnl PACKAGE=reLyX dnl PACKAGE=reLyX
dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
AC_ARG_WITH(lyx-version, AC_ARG_WITH(version-suffix,
[ --with-lyx-version[=<version>] install lyx files as lyx-<version>], [ --with-version-suffix[=<version>] install lyx files as lyx<version>],
[lyxname="lyx-$withval" [lyxname="lyx$withval"
program_suffix=-$withval], program_suffix=$withval],
[lyxname=lyx]) [lyxname=lyx])
dnl must make a macro that gets the reLyX version dnl must make a macro that gets the reLyX version