Thanks for the help.
Attached is a 'diff -r' file. (the Solaris diff does not recognize -u).
BTW If you think it's useful, I can add a pagaraph somewhere in the docs
about 'running lyx with multiple configurations'.
Lior.
On 26 May 2000, Jean-Marc Lasgouttes wrote:
> >>>>> "Lior" == Lior Silberman <[EMAIL PROTECTED]> writes:
>
> Lior> Attached to this message are the (modified) lyx_main.C,
> Lior> lyx_main.h, and lyx.man . The originials were lyx-1.1.5pre3 . I
> Lior> hope this is what you meant.
>
> It would be easier if you could send in a patch against the original
> files from lyx-1.1.5pre3. It helps us to find out what changes have
> been done.
>
> A command like
> diff -ur lyx-1.1.5pre3 lyx-1.1.5pre3-new
> should give the right output.
>
> JMarc
>
diff -r lyx-1.1.5pre3.orig/lyx.man lyx-1.1.5pre3.work/lyx.man
50a51,53
> .BI \-userdir " directory"
> sets user directory. Normally not needed.
> .TP
176a180,191
> .B LYX_USERDIR_11x
> can be used to specify which user directory to use.
> .PP
> The user directory is, in order of precedence:
> .br
> 1) -usedir command line parameter
> .br
> 2) LYX_USERDIR_11x environment variable
> .br
> 3) $HOME/.<name of binary> if no explicit setting is made
>
> .TP
Common subdirectories: lyx-1.1.5pre3.orig/src and lyx-1.1.5pre3.work/src
diff -r lyx-1.1.5pre3.orig/src/lyx_main.C lyx-1.1.5pre3.work/src/lyx_main.C
324c324,342
< user_lyxdir = AddPath(GetEnvPath("HOME"), string(".") + PACKAGE);
---
> // Directories are searched in this order:
> // 1) -userdir command line parameter
> // 2) LYX_USERDIR_11x environment variable
> // 3) $HOME/.<name of binary>
>
> // If we had a command line switch, user_lyxdir is already set
> bool explicit_userdir = true;
> if (user_lyxdir.empty()) {
>
> // LYX_USERDIR_11x environment variable
> user_lyxdir = GetEnvPath("LYX_USERDIR_11x");
>
> // default behaviour
> if (user_lyxdir.empty())
> user_lyxdir = AddPath(GetEnvPath("HOME"),
> string(".") + PACKAGE);
> explicit_userdir = false;
> }
>
329c347
< queryUserLyXDir();
---
> queryUserLyXDir(explicit_userdir);
484c502
< void LyX::queryUserLyXDir()
---
> void LyX::queryUserLyXDir(bool explicit_userdir)
496c514,518
< if (!AskQuestion(_("You don't have a personal LyX directory."),
---
> // Different wording if the user specifically requested a directory
> if (!AskQuestion( explicit_userdir
> ? _("You have specified an invalid LyX directory.")
> : _("You don't have a personal LyX directory.") ,
>
561a584
> "\t-userdir x try to set user directory to x\n"
610a634,648
> }
> // Check for "-userdir"
> else if (arg == "-userdir") {
> if (i + 1 < *argc) {
> user_lyxdir = argv[i + 1];
>
> // Now, remove these two arguments by shifting
> // the following two places down.
> (*argc) -= 2;
> for (int j= i; j < (*argc); ++j)
> argv[j] = argv[j + 2];
> --i; // After shift, check this number again.
> } else
> lyxerr << _("Missing directory for -userdir switch!")
> << endl;
diff -r lyx-1.1.5pre3.orig/src/lyx_main.h lyx-1.1.5pre3.work/src/lyx_main.h
83c83
< void queryUserLyXDir();
---
> void queryUserLyXDir(bool explicit_userdir);
