Commit cf4f58c3 authored by Etienne Renault's avatar Etienne Renault
Browse files

Update paths to please Darwin

Fixes #144.

* doc/org/.dir-locals.el.in,
doc/org/init.el.in,
python/ajax/spotcgi.in,
tests/run.in: Here.
parent a45de352
......@@ -15,6 +15,7 @@
"@abs_top_srcdir@/python:"
"@abs_top_builddir@/python/spot/.libs:"
"@abs_top_builddir@/python/spot:"
"@abs_top_builddir@/spot/ltsmin/.libs"
"@abs_top_srcdir@/python/spot:"
(getenv "PYTHONPATH")))
(setenv "DYLD_LIBRARY_PATH"
......
......@@ -38,6 +38,7 @@
"@abs_top_srcdir@/python:"
"@abs_top_builddir@/python/spot/.libs:"
"@abs_top_builddir@/python/spot:"
"@abs_top_builddir@/spot/ltsmin/.libs"
"@abs_top_srcdir@/python/spot:"
(getenv "PYTHONPATH")))
(setenv "DYLD_LIBRARY_PATH"
......
......@@ -195,15 +195,10 @@ if ('SERVER_SOFTWARE' in os.environ and
# Add the build and source directories first in the search path.
# If we are not in the right place, python will find the installed
# libraries later.
sys.path.insert(0, '@srcdir@/../.libs')
sys.path.insert(0, '@srcdir@/..')
sys.path.insert(0, '../.libs')
sys.path.insert(0, '../spot/.libs')
sys.path.insert(0, '..')
# Darwin needs some help in figuring out where non-installed libtool
# libraries are (on this platform libtool encodes the expected final
# path of dependent libraries in each library).
m = '../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/src/.libs'
os.environ['DYLD_LIBRARY_PATH'] = m
try:
# execfile('ltl2tgba.opt') no longuer work with Python 3.
......
......@@ -25,7 +25,9 @@
# libraries are (on this platform libtool encodes the expected final
# path of dependent libraries in each library).
modpath='@abs_top_builddir@/python/.libs:@abs_top_builddir@/python/spot/.libs'
modpath=$modpath:'@top_builddir@/spot/.libs:@top_builddir@/buddy/src/.libs'
modpath=$modpath:'@abs_top_builddir@/spot/ltsmin/.libs'
modpath=$modpath:'@abs_top_builddir@/spot/.libs'
modpath=$modpath:'@abs_top_builddir@/buddy/src/.libs'
# We need access to both the *.py files, and the *.so. We used to
# rely on a module called ltihooks.py to teach the import function how
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment