Changeset df4c47 in git

Timestamp:

Jul 12, 2004, 5:02:08 PM (20 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

942c79c252b19f21f8eadd758b44101f0c71b73c

Parents:

2c630c9398304741411e791a37971fa67efdafe2

Message:

*hannes: fixed idx


git-svn-id: file:///usr/local/Singular/svn/trunk@7260 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/feResource.cc (modified) (3 diffs)

kernel/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.1.1.1 2003-10-06 12:15:52 Singular Exp $ */
+/* $Id: feResource.cc,v 1.2 2004-07-12 15:02:08 Singular Exp $ */
 /*
 * ABSTRACT: management of resources
@@ -77 +77 @@
    "%d/../LIB"
    ""},
-#ifdef HAVE_PLURAL
-  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Plural",""},
-#else
   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",""},
-#endif
   {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME            ""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                ""},
   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  ""},
-#ifdef HAVE_PLURAL
-  {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/plural.hlp", ""},
-  {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/plural.idx",  ""},
-#else
   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", ""},
   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  ""},
-#endif
   {"HtmlDir",   'h',    feResDir,   "SINGULAR_HTML_DIR",    "%r/html",              ""},
-#ifdef HAVE_PLURAL
-  {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/plural/Manual/"S_VERSION1,    ""},
-#else
   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    ""},
-#endif
   {"ExDir",      'm',   feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",              ""},
 #if !defined(macintosh)
@@ -114 +101 @@
   {"emacs",    'E',    feResBinary, "ESINGULAR_EMACS",      "%b/emacs",              ""},
   {"xemacs",    'A',    feResBinary, "ESINGULAR_EMACS",      "%b/xemacs",              ""},
-#ifdef HAVE_PLURAL
-  {"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR",    "%b/Plural",           ""},
-#else
   {"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR",    "%b/Singular",           ""},
-#endif
   {"EmacsLoad",'l',    feResFile,   "ESINGULAR_EMACS_LOAD",  "%e/.emacs-singular",             ""},
   {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",   "%r/emacs",             ""},
 #elif defined(TSINGULAR)
-#ifdef HAVE_PLURAL
-  {"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR",    "%b/Plural",           ""},
-#else
   {"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR",    "%b/Singular",           ""},
-#endif
 #else
   {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             ""},