guix-env: some update.

[oweals/gnunet.git] / src / testbed / buildvars.py.in

diff --git a/src/testbed/buildvars.py.in b/src/testbed/buildvars.py.in
index e1b7d7666f45e71ac28e50309b44c9a148a20d5d..3ed65ad8295a60cd9f3e3755376d84f2f88e5e9f 100644 (file)
--- a/src/testbed/buildvars.py.in
+++ b/src/testbed/buildvars.py.in
@@ -13,12 +13,22 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with GNUnet; see the file COPYING.  If not, write to the
-# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
+# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301, USA.
 
 
 # file:     testbed/buildvars.py
 # brief:    file for importing variables from build syste into python
 # author:   Sree Harsha Totakura
 
+import os
+
+exec_prefix = '@exec_prefix@'
 libexecdir = '@libexecdir@'
+
+if libexecdir.startswith (exec_prefix):
+  libexecdir = libexecdir[len (exec_prefix):]
+
+gnunet_prefix = os.environ.get ('GNUNET_PREFIX', None)
+if gnunet_prefix and libexecdir.startswith ('/'):
+  libexecdir = os.path.join (gnunet_prefix, libexecdir[1:])