[yoda-svn] yoda: Add a --guess-prefix flag to rivet-config, cf. fastjet-con...

YODA Mercurial yoda at projects.hepforge.org
Fri Apr 8 15:45:01 BST 2016


details:   https://yoda.hepforge.org/hg/yoda/rev/fa2eb605df52
branches:  release-1-5
changeset: 1230:fa2eb605df52
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Apr 08 15:42:26 2016 +0100
description:
Add a --guess-prefix flag to rivet-config, cf. fastjet-config.

diffs (truncated from 72 to 50 lines):

--- a/ChangeLog	Thu Mar 31 14:02:46 2016 +0100
+++ b/ChangeLog	Fri Apr 08 15:42:26 2016 +0100
@@ -1,3 +1,7 @@
+2016-04-08  Andy Buckley  <andy.buckley at cern.ch>
+
+	* Add a --guess-prefix flag to rivet-config, cf. fastjet-config.
+
 2016-03-09  Andy Buckley  <andy.buckley at cern.ch>
 
 	* Version 1.5.9! (oh no, we're out of convenient version number space!!)
--- a/bin/yoda-config.in	Thu Mar 31 14:02:46 2016 +0100
+++ b/bin/yoda-config.in	Fri Apr 08 15:42:26 2016 +0100
@@ -1,13 +1,6 @@
 #! /usr/bin/env bash
 ## @configure_input@
 
-## These variables need to exist
-## Note no use of $DESTDIR... we ignore it so that destdir can be used
-## for temp installs later copied to /
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-datarootdir=@datarootdir@
-
 tmp=$(echo $* | egrep -- '--\<help\>|-\<h\>')
 if test $# -eq 0 || test -n "$tmp"; then
     echo "yoda-config: configuration tool for the YODA data analysis library"
@@ -24,13 +17,31 @@
     echo "  --libdir      : show the path to the directory containing the YODA libraries"
     echo "  --pythonpath  : show the path(s) to the directory containing YODA's Python package"
     echo
+    echo "  --guess-prefix: try to use the runtime prefix, rather than that set at install-time"
+    echo
     echo "  --cflags|--cppflags : returns a '-I' string for insertion into CPPFLAGS or CXXFLAGS"
-    echo "  --ldflags|libs      : returns a '-L/-l' string for insertion into LIBS or LIBADD"
+    echo "  --ldflags|--libs    : returns a '-L/-l' string for insertion into LIBS or LIBADD"
     echo
     echo "  --version     : returns the YODA release version number"
     exit 0
 fi
 
+
+## These variables need to exist
+## Note no use of $DESTDIR... we ignore it so that destdir can be used
+## for temp installs later copied to /
+tmp=$( echo "$*" | egrep -- '--\<guess-prefix\>')
+if [[ -n "$tmp" ]]; then
+    bindir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+    prefix=$(dirname $bindir)
+    exec_prefix=$prefix
+else


More information about the yoda-svn mailing list