From 064ccd5c05c880b8efe1cc70f0cf3c55fcfd7a1a Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 12 Feb 2016 14:02:47 +0100 Subject: [PATCH] fix paths mentioning buddy/src/.libs Those had been incorrectly renamed to buddy/spot/.libs when we rename the main src/ directory into spot/. This only affected the setting of DYLD_LIBRARY_PATH, that used to be needed on Darwin. * doc/org/.dir-locals.el.in, doc/org/init.el.in, python/ajax/spotcgi.in, tests/run.in: Fix the PATH. --- doc/org/.dir-locals.el.in | 2 +- doc/org/init.el.in | 2 +- python/ajax/spotcgi.in | 4 ++-- tests/run.in | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/org/.dir-locals.el.in b/doc/org/.dir-locals.el.in index e5cbb5533..05ac61844 100644 --- a/doc/org/.dir-locals.el.in +++ b/doc/org/.dir-locals.el.in @@ -18,7 +18,7 @@ "@abs_top_srcdir@/python/spot:" (getenv "PYTHONPATH"))) (setenv "DYLD_LIBRARY_PATH" - (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" + (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/src/.libs:" (getenv "DYLD_LIBRARY_PATH"))) (setenv "SPOT_DOTDEFAULT" "Brf(Lato)C(#ffffa0)") (setenv "SPOT_DOTEXTRA" "edge[arrowhead=vee, arrowsize=.7]") diff --git a/doc/org/init.el.in b/doc/org/init.el.in index 46325abfc..cfacff63e 100644 --- a/doc/org/init.el.in +++ b/doc/org/init.el.in @@ -41,7 +41,7 @@ "@abs_top_srcdir@/python/spot:" (getenv "PYTHONPATH"))) (setenv "DYLD_LIBRARY_PATH" - (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/spot/.libs:" + (concat "@abs_top_builddir@/python/.libs:@abs_top_builddir@/spot/.libs:@abs_top_builddir@/buddy/src/.libs:" (getenv "DYLD_LIBRARY_PATH"))) (setenv "SPOT_DOTDEFAULT" "Brf(Lato)C(#ffffa0)") (setenv "SPOT_DOTEXTRA" "edge[arrowhead=vee, arrowsize=.7]") diff --git a/python/ajax/spotcgi.in b/python/ajax/spotcgi.in index 0922b0ac2..5145a14df 100755 --- a/python/ajax/spotcgi.in +++ b/python/ajax/spotcgi.in @@ -1,6 +1,6 @@ #!@PYTHON@ # -*- mode: python; coding: utf-8 -*- -# Copyright (C) 2011, 2012, 2013, 2014, 2015 Laboratoire de Recherche et +# Copyright (C) 2011, 2012, 2013, 2014, 2015, 2016 Laboratoire de Recherche et # Développement de l'Epita (LRDE). # # This file is part of Spot, a model checking library. @@ -202,7 +202,7 @@ if ('SERVER_SOFTWARE' in os.environ and # 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/spot/.libs' + m = '../.libs:@top_builddir@/spot/.libs:@top_builddir@/buddy/src/.libs' os.environ['DYLD_LIBRARY_PATH'] = m try: diff --git a/tests/run.in b/tests/run.in index 00c19b411..2b005ec73 100755 --- a/tests/run.in +++ b/tests/run.in @@ -25,7 +25,7 @@ # 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/spot/.libs' +modpath=$modpath:'@top_builddir@/spot/.libs:@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