--- a/src/python/recoll/setup.py.in
+++ b/src/python/recoll/setup.py.in
@@ -6,7 +6,7 @@
top = os.path.join('..', '..')
-library_dirs = [os.path.join(top, 'lib')]
+library_dirs = [os.path.join(top, '.libs')]
if "CYGWIN" in os.environ:
libraries = ['recoll', 'xapian', 'iconv', 'z']
else:
@@ -18,28 +18,11 @@
else:
runtime_library_dirs = [os.path.join('@prefix@', 'lib', 'recoll')]
-# Verify that the Recoll library was compiled with the PIC options
-localdefs = os.path.join(top, 'mk', 'localdefs')
-try:
- lines = open(localdefs, 'r').readlines()
-except:
- print('You need to build recoll first. Use configure --enable-pic')
- sys.exit(1)
-picok = False
-for line in lines:
- if line.find('PICFLAGS') == 0:
- picok = True
- break
-if not picok:
- print('You need to rebuild recoll with PIC enabled. Use configure --enable-pic and make clean')
- sys.exit(1)
-
-
module1 = Extension('recoll',
define_macros = [('MAJOR_VERSION', '1'),
('MINOR_VERSION', '0'),
('UNAC_VERSION', '"1.0.7"'),
- ('RECOLL_DATADIR', '"@QTRECOLL_DATADIR@"')
+ ('RECOLL_DATADIR', '"@RECOLL_DATADIR@"')
],
include_dirs = ['/usr/local/include',
os.path.join(top, 'utils'),
@@ -57,7 +40,7 @@
define_macros = [('MAJOR_VERSION', '1'),
('MINOR_VERSION', '0'),
('UNAC_VERSION', '"1.0.7"'),
- ('RECOLL_DATADIR', '"@QTRECOLL_DATADIR@"')
+ ('RECOLL_DATADIR', '"@RECOLL_DATADIR@"')
],
include_dirs = ['/usr/local/include',
os.path.join(top, 'utils'),