Changeset b4a676 in git for findexec/feResource.cc


Ignore:
Timestamp:
Mar 29, 2012, 1:34:51 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')
Children:
fca452a782a426cceaa9e98f3a95b5a5acccd04f
Parents:
da4e5cb9371055727eda739b44f619c7eabeab5e
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-29 13:34:51+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-29 13:49:42+02:00
Message:
made findexec into a standalone library + removal of resources

add: findexec/configure.ac
del: removed the rests of libpolys/resources & references to it from everywhere
fix: findexec/feResource.cc should better not use S_UNAME
chg: factory should only need findexec & omalloc for testing
File:
1 edited

Legend:

Unmodified
Added
Removed

  • findexec/feResource.cc

    rda4e5c rb4a676  
    1414#include "config.h"
    1515
    16 #include <findexec/omFindExec.h>
     16#include "omFindExec.h"
    1717
    1818#include "feResource.h"
    … …  
    4040// #define RESOURCE_DEBUG
    4141
    42 #define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"PACKAGE_VERSION
     42#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"
    4343
    4444/*****************************************************************
    … …  
    7171   "%b/../../factory",
    7272   ""},
    73   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",(char *)""},
    74   {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME,           (char *)""},
     73  {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/Singular",          (char *)""},
     74  {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/",                  (char *)""},
    7575  {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
    7676  {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share",          (char *)""},
    … …  
    8282  {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
    8383#endif
    84   {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"PACKAGE_VERSION,    (char *)""},
     84  {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/index.php/singular-manual.html",    (char *)""},
    8585  {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
    8686  {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
Note: See TracChangeset for help on using the changeset viewer.