Replace --with-lyxname by --with-lyx-suffix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1381 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 4b67542186f651888cd5bc6e8d4716f9a34e6b8f..509582a5428830f74b8dcb9fca72dd43f29abf0e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-24  John Levon  <moz@compsoc.man.ac.uk>
+
+       * configure.in: working support for --with-lyx-suffix
+
+       * INSTALL: describe --with-lyx-suffix
+
 2001-01-15  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * INSTALL (Problems): add tip about using --with-included-string

diff --git a/INSTALL b/INSTALL
index b316df938577784cf3e777e3921147c876e884e8..2f84382e0d0327bcbf380b0dfb5f49838074722a 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -122,11 +122,13 @@ flags:
        --with-extra-lib=DIRECTORY/lib --with-extra-inc=DIRECTORY/include
     If DIRECTORY is not specified, the current prefix is used.
 
-  o --with-lyxname=STRING sets the name of the installed LyX binary and 
-    of the LyX library directory to STRING. This may be used to
-    compile lyx as lyx-1.1 and avoid clashes with earlier/later
-    versions. Default is "lyx". 
-
+  o --with-lyx-suffix=STRING adds the given suffix to the names of the 
+    LyX binary and scripts, and the library directory. For example,
+    "--with-lyx-suffix=1.1.6" would install a binary "lyx-1.1.6", and
+    create a directory "/usr/share/lyx-1.1.6", install "reLyX-1.1.6" etc.
+    Additionally, LyX will look for the user configuration file in e.g.
+    "$HOME/.lyx-1.1.6". This feature is useful for installing more than
+    one version of LyX on the same machine.
 
 There are also flags to control the internationalization support in
 LyX:

diff --git a/configure.in b/configure.in
index fbe9452a005c4a9086feaa18e2fe860ce7b962f1..85b37fa20d8013c47c4ffc65ef92bdc9e75bb1af 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,9 +11,11 @@ LYX_GET_VERSION(${srcdir}/src/version.h)
 AC_CANONICAL_SYSTEM
 AC_VALIDATE_CACHE_SYSTEM_TYPE
 
-AC_ARG_WITH(lyxname,
-  [  --with-lyxname          the name under which lyx will be installed],
-  [lyxname=$withval],[lyxname=lyx])
+AC_ARG_WITH(lyx-suffix,
+  [  --with-lyx-suffix       install lyx files as lyx-<suffix>],
+  [lyxname="lyx-$withval"
+   program_suffix=-$withval],
+  [lyxname=lyx])
 
 AM_INIT_AUTOMAKE($lyxname, $VERSION)
 

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 6b76ad0063203517134687518aed283d3c55f4e7..5ec242aae2c518e15c2794940dbba656f666f9c5 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,15 @@
+2001-01-24  John Levon  <moz@compsoc.man.ac.uk>
+
+       * Makefile.am: make configure and configure.cmd installed
+         by hand, to avoid name changes when --with-lyx-suffix
+         is used.
+ 
+       * configure:
+       * configure.m4: support --with-lyx-suffix for the lyxrc.defaults
+         reLyX and noweb2lyx scripts
+ 
+       * reLyX/configure.in: support --with-lyx-suffix
+
 2001-01-23  Dekel Tsur  <dekelts@tau.ac.il>
 
        * ui/default.ui: Add Navigate->Refs
@@ -10,5 +22,3 @@
 
        * languages: Add extra_options field. It is used to fix the ~n
         problem with Spanish.
-       
-

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1e3cd02a918c26be8883710bf86553456b35cf27..be62e535b5e9b066ebdc1697c33ede20bf838fb4 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,7 +1,6 @@
 AUTOMAKE_OPTIONS = foreign
 DISTCLEANFILES = *.orig *.rej *~ *.bak core textclass.lst packages.lst \
                lyxrc.defaults doc/LyXConfig.lyx
-pkgdata_SCRIPTS = configure configure.cmd
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in listerrors
 SUBDIRS = reLyX
 bin_SCRIPTS = listerrors
@@ -14,7 +13,7 @@ EXAMPLES = examples/*.lyx
 IMAGES = images/*.xpm
 KBD = kbd/*.kmap kbd/*.cdef
 LAYOUT = layouts/*.layout layouts/*.inc 
-LYXSCRIPTS = scripts/*
+LYXSCRIPTS = configure configure.cmd scripts/*
 TEMPL = templates/*.lyx
 TEXSUPPORT = tex/*.cls
 UI = ui/*.ui

diff --git a/lib/configure b/lib/configure
index faf849c877ae5579edb49f91d9d49170470237d9..40aa44d3d4cc84b6d268b724de2396fb8ec3af31 100755 (executable)
--- a/lib/configure
+++ b/lib/configure
@@ -11,6 +11,7 @@
 lyx_check_config=yes
 lyx_keep_temps=no
 srcdir=
+lyx_suffix=
 
 #### Parse the command line
 for ac_option do
@@ -22,12 +23,15 @@ Options:
   --help                   show this help lines
   --keep-temps             keep temporary files (for debug. purposes)
   --without-latex-config   do not run LaTeX to determine configuration
+  --with-lyx-suffix=suffix suffix of binary installed files
 EOF
       exit 0;;
     --without-latex-config)
       lyx_check_config=no ;;
     --keep-temps)
       lyx_keep_temps=yes ;;
+    --with-lyx-suffix*)
+      lyx_suffix=`echo "$ac_option" | sed 's,--with-lyx-suffix=,,;s,^,-,'`
   esac 
 done
 
@@ -223,6 +227,7 @@ fi
 
 PATH=${save_PATH}
 test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i"
+tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$lyx_suffix,"`
 
 echo $ac_n "checking for a Noweb -> LyX converter""... $ac_c"
 echo "$ac_t""(noweb2lyx)"
@@ -259,6 +264,7 @@ if test -z "$literate_to_lyx_command" ; then
 fi
 
 test $literate_to_lyx_command = "noweb2lyx" && literate_to_lyx_command="noweb2lyx \$\$i \$\$o"
+literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$lyx_suffix,"`
 
 # Search something to process a literate document
 echo $ac_n "checking for a Noweb -> LaTeX converter""... $ac_c"

diff --git a/lib/configure.m4 b/lib/configure.m4
index 9c737877fc62d0a0a2e30e8d13dd4d0a1642929f..1e564869ef09b4f8be53fec830efbfb26266fb95 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -85,6 +85,7 @@ dnl ######### End M4 macros #############################################
 lyx_check_config=yes
 lyx_keep_temps=no
 srcdir=
+lyx_suffix=
 
 #### Parse the command line
 for ac_option do
@@ -96,12 +97,15 @@ Options:
   --help                   show this help lines
   --keep-temps             keep temporary files (for debug. purposes)
   --without-latex-config   do not run LaTeX to determine configuration
+  --with-lyx-suffix=suffix suffix of binary installed files
 EOF
       exit 0;;
     --without-latex-config)
       lyx_check_config=no ;;
     --keep-temps)
       lyx_keep_temps=yes ;;
+    --with-lyx-suffix*)
+      lyx_suffix=`echo "$ac_option" | sed 's,--with-lyx-suffix=,,;s,^,-,'`
   esac 
 done
 
@@ -185,9 +189,11 @@ PATH=${PATH}:./reLyX/
 SEARCH_PROG([for a LaTeX -> LyX converter],tex_to_lyx_command,reLyX)
 PATH=${save_PATH}
 test $tex_to_lyx_command = "reLyX" && tex_to_lyx_command="reLyX -f \$\$i"
+tex_to_lyx_command=`echo $tex_to_lyx_command | sed "s,reLyX,reLyX$lyx_suffix,"`
 
 SEARCH_PROG([for a Noweb -> LyX converter],literate_to_lyx_command,noweb2lyx)
 test $literate_to_lyx_command = "noweb2lyx" && literate_to_lyx_command="noweb2lyx \$\$i \$\$o"
+literate_to_lyx_command=`echo $literate_to_lyx_command | sed "s,noweb2lyx,noweb2lyx$lyx_suffix,"`
 
 # Search something to process a literate document
 SEARCH_PROG([for a Noweb -> LaTeX converter],literate_to_tex_command,noweave)

diff --git a/lib/reLyX/configure.in b/lib/reLyX/configure.in
index f59fec50ad7406efa9f8442907628ccaae9791a5..3975fcfec644f8d5441371ae3e15b997e542d48d 100644 (file)
--- a/lib/reLyX/configure.in
+++ b/lib/reLyX/configure.in
@@ -6,9 +6,11 @@ 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(lyxname,
-  [  --with-lyxname          the name under which lyx will be installed],
-  [lyxname=$withval],[lyxname=lyx])
+AC_ARG_WITH(lyx-suffix,
+  [  --with-lyx-suffix       install lyx files as lyx-<suffix>],
+  [lyxname="lyx-$withval"
+   program_suffix=-$withval],
+  [lyxname=lyx])
 
 dnl must make a macro that gets the reLyX version
 VERSION=2.0

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 48e5b65b0a67e9e78bdcb3f24c68b197a716b6ea..9acd80cf7a9d2c634237811dc6ea80c2a452d03d 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,6 +12,7 @@ src/credits_form.C
 src/CutAndPaste.C
 src/debug.C
 src/exporter.C
+src/ext_l10n.h
 src/filedlg.C
 src/FontLoader.C
 src/form1.C
@@ -26,7 +27,13 @@ src/frontends/gnome/FormUrl.C
 src/frontends/gnome/Menubar_pimpl.C
 src/frontends/kde/citationdlg.C
 src/frontends/kde/dlg/copyrightdlgdata.C
+src/frontends/kde/dlg/docdlgdata.C
+src/frontends/kde/dlg/docextradlgdata.C
+src/frontends/kde/dlg/docgeometrydlgdata.C
+src/frontends/kde/dlg/doclanguagedlgdata.C
+src/frontends/kde/dlg/docsettingsdlgdata.C
 src/frontends/kde/dlg/indexdlgdata.C
+src/frontends/kde/dlg/lengthentry.C
 src/frontends/kde/dlg/paraabovedlgdata.C
 src/frontends/kde/dlg/parabelowdlgdata.C
 src/frontends/kde/dlg/paradlgdata.C
@@ -34,8 +41,10 @@ src/frontends/kde/dlg/paraextradlgdata.C
 src/frontends/kde/dlg/parageneraldlgdata.C
 src/frontends/kde/dlg/printdlgdata.C
 src/frontends/kde/dlg/tabcreatedlgdata.C
+src/frontends/kde/docdlg.C
 src/frontends/kde/FormCitation.C
 src/frontends/kde/FormCopyright.C
+src/frontends/kde/FormDocument.C
 src/frontends/kde/FormIndex.C
 src/frontends/kde/FormParagraph.C
 src/frontends/kde/FormPrint.C
@@ -49,6 +58,7 @@ src/frontends/kde/paraextradlg.C
 src/frontends/kde/parageneraldlg.C
 src/frontends/kde/printdlg.C
 src/frontends/kde/refdlg.C
+src/frontends/kde/tabcreatedlg.C
 src/frontends/kde/tocdlg.C
 src/frontends/kde/urldlg.C
 src/frontends/xforms/FormBase.h
@@ -103,6 +113,7 @@ src/insets/insetlist.C
 src/insets/insetmarginal.C
 src/insets/insetminipage.C
 src/insets/insetparent.C
+src/insets/insetref.C
 src/insets/insettabular.C
 src/insets/insettext.C
 src/insets/insettheorem.C
@@ -148,4 +159,3 @@ src/support/path.h
 src/tabular.C
 src/text2.C
 src/text.C
-src/ext_l10n.h

diff --git a/src/ChangeLog b/src/ChangeLog
index 090c8d59191dde9dfbfc7b7421b1804dd40f63be..a24700f73ebf936d4fe77ac3e7ff1452299f7697 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-24  John Levon  <moz@compsoc.man.ac.uk>
+
+       * lyx_main.C: tiny error message fix
+
 2001-01-24  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * lyx_gui.C (LyXGUI): force the LC_NUMERIC locale to "C" after

diff --git a/src/lyx_main.C b/src/lyx_main.C
index cf5a25d79e8771132e1a489d9261a902dfc0e1c0..8d4b865dcfa3729fbba0fb9c8ab94a54a91a281b 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -318,10 +318,10 @@ void LyX::init(int */*argc*/, char **argv, bool gui)
 
        // Warn the user if we couldn't find "chkconfig.ltx"
        if (system_lyxdir == "./") {
-               lyxerr <<_("LyX Warning! Couldn't determine system directory.")
-                      <<_("Try the '-sysdir' command line parameter or")
+               lyxerr <<_("LyX Warning! Couldn't determine system directory. ")
+                      <<_("Try the '-sysdir' command line parameter or ")
                       <<_("set the environment variable LYX_DIR_11x to the "
-                          "LyX system directory")
+                          "LyX system directory ")
                       << _("containing the file `chkconfig.ltx'.") << endl;
                if (!path_shown)
                        lyxerr << _("Using built-in default ")