Changeset 00efe1 in git

Timestamp:

Jun 24, 2013, 11:04:38 AM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

3fa1477ae6b4693a0a1b0594cc5e8b9a26b9f7e7

Parents:

96c5cb800f6f54049fb5595e82c0d4d3fc31f8c5

Message:

fix: path names for modules: p_Procs in %d/libexec/singular/MOD, %b/MOD

Files:

• libpolys/polys/templates/p_Procs_Generate.cc (modified) (1 diff)
• resources/feResource.cc (modified) (2 diffs)

libpolys/polys/templates/p_Procs_Generate.cc

@@ -313 +313 @@
 
 #ifndef p_Procs_Static
-  printf(" *\n");
+  printf("*\n");
   printf("* KernelProcs          = %d\n",KernelProcs);
   printf("* FieldIndepProcs      = %d\n",FieldIndepProcs);

resources/feResource.cc

@@ -79 +79 @@
    ""},
   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/Singular",          (char *)""},
-  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/MOD/",                  (char *)""},
+  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "",                  (char *)""},
   // should be changed to %b/../libexec/singular/pProcs/:
-  {"ProcDir",   'P',    feResDir,   "SINGULAR_PROCS_DIR",   "%b/MOD/",                  (char *)""},
+  {"ProcDir",   'P',    feResDir,   "SINGULAR_PROCS_DIR",   "%d/libexec/singular/MOD/",                  (char *)""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
   {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share/",          (char *)""},
@@ -382 +382 @@
   if (warn > 0 || (warn < 0 && config->value != NULL))
   {
-    printf("// ** Could not get %s. ", config->key);
-    printf("// ** Either set environment variable %s to %s,",
+    printf("// ** Could not get %s.\n", config->key);
+    printf("// ** Either set environment variable %s to %s,\n",
          config->env, config->key);
     feSprintf(value, config->fmt, warn);
-    printf("// ** or make sure that %s is at %s", config->key, value);
+    printf("// ** or make sure that %s is at %s\n", config->key, value);
   }
 #ifdef RESOURCE_DEBUG