This updates the 1.2.0 behaviour to that of what
the 1.1.6 patch will do
please apply
thanks
john
--
"This is the most blatant case of fraudulent advertising since my suit against the
film 'The Neverending Story'."
- Lionel Hutz
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.771
diff -u -p -r1.771 ChangeLog
--- ChangeLog 2001/03/01 15:03:50 1.771
+++ ChangeLog 2001/03/02 13:48:37
@@ -1,3 +1,9 @@
+2001-03-02 John Levon <[EMAIL PROTECTED]>
+
+ * configure.in:
+ * config/lyxinclude.m4:
+ * INSTALL: minor changes, become --with-version-suffix
+
2001-02-23 John Levon <[EMAIL PROTECTED]>
* configure.in:
Index: INSTALL
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/INSTALL,v
retrieving revision 1.25
diff -u -p -r1.25 INSTALL
--- INSTALL 2001/03/01 15:03:51 1.25
+++ INSTALL 2001/03/02 13:48:37
@@ -122,14 +122,14 @@ flags:
--with-extra-lib=DIRECTORY/lib --with-extra-inc=DIRECTORY/include
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
- The LyX data directory will be something like <whatever>/lyx-1.1.6/.
+ o --with-version-suffix will install LyX as lyx<version>, e.g. lyx1.2.0
+ The LyX data directory will be something like <whatever>/lyx1.2.0/.
Additionally your user configuration files will be found in e.g.
- $HOME/.lyx-1.1.6
+ $HOME/.lyx1.2.0
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,
- 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
LyX:
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.37
diff -u -p -r1.37 lyxinclude.m4
--- config/lyxinclude.m4 2001/03/01 15:03:51 1.37
+++ config/lyxinclude.m4 2001/03/02 13:48:37
@@ -37,15 +37,15 @@ dnl
dnl
AC_DEFUN(LYX_VERSION_SUFFIX,[
AC_MSG_CHECKING([for install target ... ])
-AC_ARG_WITH(lyx-version,
- [ --with-lyx-version[=<version>] install lyx files as lyx-<suffix>],
+AC_ARG_WITH(version-suffix,
+ [ --with-version-suffix[=<version>] install lyx files as lyx<version>],
[if test "x$withval" = "xyes";
then
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
- lyxname="lyx-$withval"
- program_suffix=-$withval],
+ lyxname="lyx$withval"
+ program_suffix=$withval],
[lyxname=lyx])
AC_MSG_RESULT([$lyxname])
])
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.26
diff -u -p -r1.26 ChangeLog
--- lib/ChangeLog 2001/03/01 15:57:09 1.26
+++ lib/ChangeLog 2001/03/02 13:48:37
@@ -1,3 +1,7 @@
+2001-03-02 John Levon <[EMAIL PROTECTED]>
+
+ * reLyX/configure.in: become --with-version-suffix
+
2001-03-01 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* templates/g-brief-de.lyx: fix typo.
Index: lib/reLyX/configure.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/configure.in,v
retrieving revision 1.10
diff -u -p -r1.10 configure.in
--- lib/reLyX/configure.in 2001/03/01 15:03:51 1.10
+++ lib/reLyX/configure.in 2001/03/02 13:48:37
@@ -6,10 +6,10 @@ AC_CONFIG_AUX_DIR(../../config)
dnl PACKAGE=reLyX
dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
-AC_ARG_WITH(lyx-version,
- [ --with-lyx-version[=<version>] install lyx files as lyx-<version>],
- [lyxname="lyx-$withval"
- program_suffix=-$withval],
+AC_ARG_WITH(version-suffix,
+ [ --with-version-suffix[=<version>] install lyx files as lyx<version>],
+ [lyxname="lyx$withval"
+ program_suffix=$withval],
[lyxname=lyx])
dnl must make a macro that gets the reLyX version
