[SCM] an open source computer algebra system branch, master-3-1-5, updated. dcebb184fbf374a8905edd0b02d7795bc29620e9

[Felix Salfelder]

The following commit has been merged in the master-3-1-5 branch:
commit e8dffdd2d0a41af2676cbbed091c69a3cfa04e9a
Author: Bernhard R. Link <brlink at debian.org>
Date:   Sat Feb 25 13:47:46 2012 +0100

    default path settings
    
    - Hardcode "Singular" pathname, so we can install the library to a
      different location than the binaries.
    - as S_BIN_DIR and S_ROOT_DIR are the same in the Debian package,
      don't default ROOT_DIR to BIN_DIR/..
    - xterm set as x-terminal-emulator alternative.
    - emacs binary located in /usr/bin
    - remove %b/.. and %r/.. from default search path in order to
      not look into /usr/lib/LIB for libraries.

diff --git a/kernel/feResource.cc b/kernel/feResource.cc
index 01bb816..950929a 100644
--- a/kernel/feResource.cc
+++ b/kernel/feResource.cc
@@ -75,13 +75,11 @@ static feResourceConfig_s feResourceConfigs[] =
    "%b/LIB;"
    "%b/MOD;"
    "%r/LIB;"
-   "%r/../LIB;"
    "%d/LIB;"
-   "%d/../LIB"
    ""},
-  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",(char *)""},
-  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME,           (char *)""},
-  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
+  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%b/Singular",(char *)S_ROOT_DIR "/Singular"},
+  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%r",               (char *)""},
+  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",     S_ROOT_DIR,  (char *)""},
   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", (char *)""},
   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  (char *)""},
@@ -94,8 +92,8 @@ static feResourceConfig_s feResourceConfigs[] =
   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
 
 #ifdef ESINGULAR
-  {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "%b/emacs",             (char *)""},
-  {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "%b/xemacs",            (char *)""},
+  {"emacs",     'E',    feResBinary,"ESINGULAR_EMACS",      "/usr/bin/emacs",       (char *)""},
+  {"xemacs",    'A',    feResBinary,"ESINGULAR_EMACS",      "/usr/bin/xemacs",      (char *)""},
   {"SingularEmacs",'M', feResBinary,"ESINGULAR_SINGULAR",   "%b/Singular",          (char *)""},
   {"EmacsLoad", 'l',    feResFile,  "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular",   (char *)""},
   {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",  "%r/emacs",             (char *)""},
@@ -104,7 +102,7 @@ static feResourceConfig_s feResourceConfigs[] =
 #ifdef ix86_Win
   {"rxvt",      'X',    feResBinary,"RXVT",                 "%b/rxvt",              (char *)""},
 #else
-  {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             (char *)""},
+  {"xterm",     'X',    feResBinary,"XTERM",                "/usr/bin/x-terminal-emulator",             (char *)""},
 #endif
 #else
   {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             (char *)""},

-- 
an open source computer algebra system