1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
diff -Naur Singular-3-0-4/kernel/feResource.cc Singular-3-0-4.new/kernel/feResource.cc
--- Singular-3-0-4/kernel/feResource.cc 2008-03-19 13:44:08.000000000 -0400
+++ Singular-3-0-4.new/kernel/feResource.cc 2008-04-21 09:10:53.000000000 -0400
@@ -41,7 +41,7 @@
#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
#endif
#else // ! defined(MAKE_DISTRIBUTION)
-#define SINGULAR_DEFAULT_DIR S_ROOT_DIR
+#define SINGULAR_DEFAULT_DIR "/usr"
#endif // defined(MAKE_DISTRIBUTION)
/*****************************************************************
@@ -73,33 +73,31 @@
{
{"SearchPath", 's', feResPath, NULL,
"$SINGULARPATH;"
- "%b/LIB;"
- "%b/MOD;"
+ "%r/share/singular/MOD;"
"%r/LIB;"
- "%r/../LIB;"
+ "%r/share/singular/LIB;"
"%d/LIB;"
- "%d/../LIB"
""},
- {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/"S_UNAME"/Singular",""},
- {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/"S_UNAME ""},
- {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%b/..", ""},
+ {"Singular", 'S', feResBinary,"SINGULAR_EXECUTABLE", "%d/bin/Singular",""},
+ {"BinDir", 'b', feResDir, "SINGULAR_BIN_DIR", "%d/bin" ""},
+ {"RootDir", 'r', feResDir, "SINGULAR_ROOT_DIR", "%d", ""},
{"DefaultDir",'d', feResDir, "SINGULAR_DEFAULT_DIR", SINGULAR_DEFAULT_DIR, ""},
- {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/info/singular.hlp", ""},
- {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/doc/singular.idx", ""},
- {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/html", ""},
+ {"InfoFile", 'i', feResFile, "SINGULAR_INFO_FILE", "%r/share/info/singular.info.bz2", ""},
+ {"IdxFile", 'x', feResFile, "SINGULAR_IDX_FILE", "%r/share/singular/singular.idx", ""},
+ {"HtmlDir", 'h', feResDir, "SINGULAR_HTML_DIR", "%r/share/doc/PFSUBST/html", ""},
#ifdef ix86_Win
{"HtmlHelpFile", 'C', feResFile, "SINGULAR_CHM_FILE", "%r/doc/Manual.chm", ""},
#endif
{"ManualUrl", 'u', feResUrl, "SINGULAR_URL", "http://www.singular.uni-kl.de/Manual/"S_VERSION1, ""},
- {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/examples", ""},
+ {"ExDir", 'm', feResDir, "SINGULAR_EXAMPLES_DIR","%r/share/doc/PFSUBST/examples", ""},
{"Path", 'p', feResPath, NULL, "%b;$PATH", ""},
#ifdef ESINGULAR
{"emacs", 'E', feResBinary, "ESINGULAR_EMACS", "%b/emacs", ""},
{"xemacs", 'A', feResBinary, "ESINGULAR_EMACS", "%b/xemacs", ""},
{"SingularEmacs",'M',feResBinary, "ESINGULAR_SINGULAR", "%b/Singular", ""},
- {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%e/.emacs-singular", ""},
- {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/emacs", ""},
+ {"EmacsLoad",'l', feResFile, "ESINGULAR_EMACS_LOAD", "%r/share/emacs/site-lisp/singular/.emacs-singular", ""},
+ {"EmacsDir", 'e', feResDir, "ESINGULAR_EMACS_DIR", "%r/share/emacs/site-lisp/singular", ""},
#elif defined(TSINGULAR)
{"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR", "%b/Singular", ""},
#ifdef ix86_Win
@@ -108,7 +106,7 @@
{"xterm", 'X', feResBinary,"XTERM", "%b/xterm", ""},
#endif
#else
- {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/emacs", ""},
+ {"EmacsDir", 'e', feResDir, "SINGULAR_EMACS_DIR", "%r/share/emacs/site-lisp/singular", ""},
#endif
{NULL, 0, feResUndef, NULL, NULL, NULL}, // must be the last record
};
diff -Naur Singular-3-0-4/kernel/mod_raw.cc Singular-3-0-4.new/kernel/mod_raw.cc
--- Singular-3-0-4/kernel/mod_raw.cc 2008-03-19 13:44:10.000000000 -0400
+++ Singular-3-0-4.new/kernel/mod_raw.cc 2008-04-21 09:10:53.000000000 -0400
@@ -111,11 +111,11 @@
void* dynl_open_binary_warn(char* binary_name, const char* msg)
{
void* handle = NULL;
- const char* bin_dir = feGetResource('b');
+ const char* bin_dir = feGetResource('r');
if (bin_dir != NULL)
{
char path_name[MAXPATHLEN];
- sprintf(path_name, "%s%s%s.%s", bin_dir, DIR_SEPP, binary_name,
+ sprintf(path_name, "%s%s%s%s.%s", bin_dir,"/lib/singular", DIR_SEPP, binary_name,
DL_TAIL);
handle = dynl_open(path_name);
if (handle == NULL && ! warn_handle)
|
GitWeb