alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update paths to please Darwin

Browse source 
Fixes #144.

* doc/org/.dir-locals.el.in,
doc/org/init.el.in,
python/ajax/spotcgi.in,
tests/run.in: Here.
This commit is contained in:
Etienne Renault 2016-02-17 13:56:12 +01:00
parent a45de35244
commit cf4f58c34b
4 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
doc/org/.dir-locals.el.in
View file

@ -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"

1
doc/org/init.el.in
View file

@ -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"

7
python/ajax/spotcgi.in
View file

@ -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.

4
tests/run.in
View file

@ -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