Changeset 5ab8e2 in git

Timestamp:

Jun 3, 1998, 8:15:48 PM (26 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

f75bebbdfe00b1013d79e040b5f5f26dd37a9cb6

Parents:

2b3ca335dcc9efdc0e13d000f9f2c642e9937a9f

Message:

* introduced SINGULAR_BIN_DIR


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

Location:

Singular

Files:

• febase.cc (modified) (2 diffs)
• mod2.h.in (modified) (1 diff)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.39 1998-06-03 12:58:35 obachman Exp $ */
+/* $Id: febase.cc,v 1.40 1998-06-03 18:15:48 pohl Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -243 +243 @@
 }
 
+#ifdef WINNT
+#define INFOPROG "info.exe"
+#else
+#define INFOPROG "info"
+#endif
+
 // we first look into bindir, if nothing found there, we use HAVE_INFO
 static char* feGetInfoProgram(const char* bindir)
 {
-#ifdef HAVE_INFO
-  char* infoprog = (char* ) AllocL(max(strlen(HAVE_INFO), 
-                                       (bindir != NULL ? strlen(bindir) : 0)) 
-                                   + 10);
-#else
-  char* infoprog = (char*) AllocL((bindir != NULL ? strlen(bindir)) + 10);
-#endif
-  
+  char infoprog[MAXPATHLEN];
   if (bindir != NULL)
   {
-    sprintf(infoprog, "%s/info", bindir);
-    if (! access(infoprog, X_OK)) return infoprog;
-  }
+    sprintf(infoprog, "%s/%s", bindir, INFOPROG);
+    if (! access(infoprog, X_OK)) return mstrdup(infoprog);
+  }
+
+  sprintf(infoprog, "%s/%s", SINGULAR_BIN_DIR, INFOPROG);
+  if (! access(infoprog, X_OK)) return mstrdup(infoprog);
   
 #ifdef HAVE_INFO
   sprintf(infoprog, "%s", HAVE_INFO);
-  if (! access(infoprog, X_OK)) return infoprog;
+  if (! access(infoprog, X_OK)) return mstrdup(infoprog);
 #endif
   // nothing found, let's try "info"
   sprintf(infoprog, "info");
-  return infoprog;
+  return mstrdup(infoprog);
 }
 

Singular/mod2.h.in

@@ -109 +109 @@
 /* Define the root directory from where Singular searches for libs and info */
 #define SINGULAR_ROOT_DIR "/usr/local/"
+/* Define the directory where binaries are found (resp. put) */
+#define SINGULAR_BIN_DIR "/usr/local/bin/"
 
 /*******************************************************************