Changeset 394d507 in git for resources/feResource.cc

Timestamp:

Oct 31, 2013, 3:33:58 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

763c4ddb0c6304b684b9b52b91d2713df4bbb4ee

Parents:

b71c90b0435ff0a26e3081e93b19ece9c2262807

Message:

chg: use LIBEXEC_DIR/PREFIX for resources

File:

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

resources/feResource.cc

@@ -42 +42 @@
 // #define RESOURCE_DEBUG
 
-#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"
+#define SINGULAR_DEFAULT_DIR PREFIX
 
 /*****************************************************************
@@ -63 +63 @@
    "%r/share/singular/LIB;"
    "%b/../share/singular/LIB;"
+   // gftables:
    "%D/factory;"
    "%r/share/factory;"
-   "%b/../share/factory;"
-   "%r/libexec/singular/MOD;"
-   "%b/../libexec/singular/MOD;"
    "%b/LIB;"
-   "%r/LIB;"
-   "%d/LIB;"
+   "%b/../factory;"
+   // path for dynamic modules, should match ProcDir:
    "%b/MOD;"
-   "%r/MOD;"
-   "%d/MOD;"
-   "%b;"
-   "%b/../factory;"
-   "%b/../../factory",
-   ""},
+   LIBEXEC_DIR "/singular/MOD;"
+   "%b",
+   (char *)""},
   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/Singular",          (char *)""},
   {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "",                  (char *)""},
-  // should be changed to %b/../libexec/singular/pProcs/:
-  {"ProcDir",   'P',    feResDir,   "SINGULAR_PROCS_DIR",   "%r/libexec/singular/MOD/",                  (char *)""},
+  // should be changed to %b/../lib/singular/pProcs/:
+  {"ProcDir",   'P',    feResPath,  "SINGULAR_PROCS_DIR",
+     "%b/MOD;"
+     LIBEXEC_DIR "/singular/MOD;"
+     "%r/libexec/singular/MOD",                  (char *)""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
   {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share/",          (char *)""},
@@ -188 +186 @@
   // don't complain about stuff when initializing SingularPath
   feResource('s',0);
+  feResource('P');
 
 #if defined(HAVE_SETENV) || defined(HAVE_PUTENV)