tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

install filters to /usr/local

Browse Source
This commit is contained in:
dockes
2005-12-02 16:17:29 +00:00
parent 24ea431872
commit 95c89880e6
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/rclconfig.cpp
+10 -5
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: rclconfig.cpp,v 1.14 2005-11-25 09:13:06 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: rclconfig.cpp,v 1.15 2005-12-02 16:17:29 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
#include <unistd.h>
#include <errno.h>
@@ -176,9 +176,9 @@ string RclConfig::getMimeIconName(const string &mtype)
return hs;
}
// Look up an executable filter.
// We look in RECOLL_BINDIR, RECOLL_CONFDIR, then let the system use
// the PATH
// Look up an executable filter.
// We look in RECOLL_FILTERSDIR, filtersdir param, RECOLL_CONFDIR, then
// let the system use the PATH
string find_filter(RclConfig *conf, const string &icmd)
{
// If the path is absolute, this is it
@@ -187,11 +187,16 @@ string find_filter(RclConfig *conf, const string &icmd)
string cmd;
const char *cp;
if (cp = getenv("RECOLL_BINDIR")) {
if (cp = getenv("RECOLL_FILTERSDIR")) {
cmd = cp;
path_cat(cmd, icmd);
if (access(cmd.c_str(), X_OK) == 0)
return cmd;
} else if (conf->getConfParam(string("filtersdir"), cmd)) {
path_cat(cmd, icmd);
if (access(cmd.c_str(), X_OK) == 0)
return cmd;
} else {
cmd = conf->getConfDir();
path_cat(cmd, icmd);