From cf1ce89d7c7998467beb20a1e1b8221ceb3080e9 Mon Sep 17 00:00:00 2001
From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 5 Mar 2001 11:54:00 +0000
Subject: [PATCH] John's --with-version-suffix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1670 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog              |  6 ++++++
 INSTALL                |  8 ++++----
 config/lyxinclude.m4   | 12 ++++++------
 lib/ChangeLog          |  4 ++++
 lib/reLyX/configure.in |  8 ++++----
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cf81ac6897..5508171f38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* configure.in:
diff --git a/INSTALL b/INSTALL
index f35652d701..ac82469ffe 100644
--- a/INSTALL
+++ b/INSTALL
@@ -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. lyx-1.2.0
+    The LyX data directory will be something like <whatever>/lyx-1.2.0/.
     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
     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:
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index bc792fc782..1f70b9c757 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -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,"`
+     withval="-$VERSION"
+     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])
 ])
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 0d5f94f6fd..50f1c3069c 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -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>
 
 	* examples/fr_*: renamed french example files in french.
diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index d773415aa7..eac77d53e8 100644
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -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
-- 
2.39.2