Changeset 96d379 in git

Timestamp:

May 25, 1998, 3:04:54 PM (26 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

de614790315407e7ef79dc75ff6bcb9b5e13f1fe

Parents:

74ec24ce8896da0a92121f4ba3c8abad240903ee

Message:

* hannes: fixed relative SPATH


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

File:

• Singular/febase.cc (modified) (3 diffs)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.35 1998-04-28 13:12:09 Singular Exp $ */
+/* $Id: febase.cc,v 1.36 1998-05-25 13:04:54 Singular Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -114 +114 @@
 extern "C" char* find_executable(const char* argv0);
 
-#define SINGULAR_RELATIVE_DATA_DIR "LIB"
+//#define SINGULAR_RELATIVE_DATA_DIR "LIB"
+// Singular is      $ROOT/bin/Singular,
+// look for libs in $ROOT/share/Singular/xx.lib:
+#define SINGULAR_RELATIVE_DATA_DIR "../share/Singular"
 
 static char* SearchPath = NULL;
@@ -169 +172 @@
 #endif
   
+    if (env != NULL)
+      plength = strlen(env) + 1;
+
     if (argv0 != NULL)
       sibbling = feRemovePathnameHead(feGetExpandedExecutable(argv0));
   
-    if (env != NULL)
-      plength = strlen(env) + 1;
-
     if (sibbling != NULL)
       plength += strlen(sibbling) + strlen(SINGULAR_RELATIVE_DATA_DIR) + 2;