Changeset 2afef4 in git for Singular/febase.cc

Timestamp:

Jun 15, 1998, 5:47:59 PM (26 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

4d6470fe58d551b765bfa08826264f20581e5a3c

Parents:

388317006f4f6037f2c4d3755506bbcc36118877

Message:

* changes for distribution, in particular for win distribution

* extra.cc: new calls: SearchPath, InfoFile, InfoProgram


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

File:

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

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.52 1998-06-15 12:58:59 pohl Exp $ */
+/* $Id: febase.cc,v 1.53 1998-06-15 15:47:57 obachman Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -243 +243 @@
 // bindir/../doc/singular.hlp
 // bindir/../info/singular.hlp
-// bindir/../../doc/singular.hlp
+// bindir/../../Singular/doc/$version/singular.hlp
+// bindir/../../Singular/doc/singular.hlp
 // bindir/../../info/singular.hlp
-// ROOTDIR/doc/singular.hlp
+// ROOTDIR/Singular/doc/$version/singular.hlp
+// ROOTDIR/Singular/doc/singular.hlp
 // ROOTDIR/info/singular.hlp
 #ifdef WINNT
@@ -274 +276 @@
   if (bindir != NULL)
   {
+    // bindir/../doc/singular.hlp
     sprintf(hlpfile,"%s/../doc/singular.hlp", bindir);
 #ifdef PATH_DEBUG
@@ -280 +283 @@
     if (! access(hlpfile, R_OK)) return feFixFileName(hlpfile);
 
+    // bindir/../info/singular.hlp
     sprintf(hlpfile,"%s/../info/singular.hlp", bindir);
 #ifdef PATH_DEBUG
@@ -286 +290 @@
     if (! access(hlpfile, R_OK)) return feFixFileName(hlpfile);
 
-    sprintf(hlpfile,"%s/../../doc/singular.hlp", bindir);
+    // bindir/../../Singular/doc/$version/singular.hlp
+    sprintf(hlpfile,"%s/../../Singular/doc/%s/singular.hlp",bindir,S_VERSION1);
 #ifdef PATH_DEBUG
     Print("trying %s -- %s\n", hlpfile, ( access(hlpfile, R_OK) ? "no" : "yes"));
@@ -292 +297 @@
     if (! access(hlpfile, R_OK)) return feFixFileName(hlpfile);
 
+    // bindir/../../Singular/doc/singular.hlp
+    sprintf(hlpfile,"%s/../../Singular/doc/singular.hlp", bindir);
+#ifdef PATH_DEBUG
+    Print("trying %s -- %s\n", hlpfile, ( access(hlpfile, R_OK) ? "no" : "yes"));
+#endif
+    if (! access(hlpfile, R_OK)) return feFixFileName(hlpfile);
+
+    // bindir/../../info/singular.hlp
     sprintf(hlpfile,"%s/../../info/singular.hlp", bindir);
 #ifdef PATH_DEBUG
@@ -298 +311 @@
     if (! access(hlpfile, R_OK)) return feFixFileName(hlpfile);
 
-    sprintf(hlpfile,"%s/doc/singular.hlp", SINGULAR_ROOT_DIR);
+    // ROOTDIR/Singular/doc/$version/singular.hlp
+    sprintf(hlpfile,"%s/Singular/doc/%s/singular.hlp", SINGULAR_ROOT_DIR, S_VERSION1);
 #ifdef PATH_DEBUG
     Print("trying %s -- %s\n", hlpfile, ( access(hlpfile, R_OK) ? "no" : "yes"));
@@ -304 +318 @@
     if (! access(hlpfile, R_OK)) return feFixFileName(hlpfile);
 
+    // ROOTDIR/Singular/doc/singular.hlp
+    sprintf(hlpfile,"%s/Singular/doc/singular.hlp", SINGULAR_ROOT_DIR);
+#ifdef PATH_DEBUG
+    Print("trying %s -- %s\n", hlpfile, ( access(hlpfile, R_OK) ? "no" : "yes"));
+#endif
+    if (! access(hlpfile, R_OK)) return feFixFileName(hlpfile);
+
+    // ROOTDIR/info/singular.hlp
     sprintf(hlpfile,"%s/info/singular.hlp", SINGULAR_ROOT_DIR);
  #ifdef PATH_DEBUG