allow for relocating clhep

Cast/Cast-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

ChangeLog

+
+2011-06-06 Lynn Garren <garren@fnal.gov>
+
+	* clhep-config: Since the clhep installation may have been relocated,
+	  use the full path to clhep-config to get the install prefix.
+	  Note that this presumes that bin, lib, and include are all under 
+	  the same $prefix.
+
+2011-05-27  Mark Fischler <mf@fnal.gov> and Lynn Garren <garren@fnal.gov>
+
+	* Random/Random/RandSkewNormal.h, Random/Random/RandSkewNormal.icc, 
+	  Random/src/RandSkewNormal.cc: An implementation of the Azzalini 
+	  skew-normal distribution, as requested in bug #75534
+
 ==============================
 11.11.10 Release CLHEP-2.1.0.1
 ==============================

Evaluator/Evaluator-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

Exceptions/Exceptions-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

Fields/Fields-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

GenericFunctions/GenericFunctions-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

Geometry/Geometry-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

Matrix/Matrix-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

Random/Random-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

RandomObjects/RandomObjects-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

RefCount/RefCount-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

Units/Units-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

Utility/Utility-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

Vector/Vector-config.in

@@ -2,9 +2,26 @@
 # @configure_input@
 
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
+
+# use the full name of this script to get the current path
+configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
+firstc=`expr ${configpath} : / >/dev/null`
+if [ ! ${firstc} ]
+then
+   binpath=${configpath}
+else
+   cd ${calldir}/${configpath}; newpath=`pwd`
+   binpath=${newpath}
+fi
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {

clhep-config.in

 #! /bin/sh
 # @configure_input@
 
+# we include the paths of the original install directories for reference
+orig_prefix=@prefix@
+orig_exec_prefix=@exec_prefix@
+orig_includedir=@includedir@
 
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-includedir=@includedir@
-
+# use the full name of this script to get the current path
 configpath=`dirname ${0}`
+# check for a leading slash to determine if this is a relative path
 firstc=`expr ${configpath} : / >/dev/null`
 if [ ! ${firstc} ]
 then
-   prefix=${configpath}
+   binpath=${configpath}
 else
    cd ${calldir}/${configpath}; newpath=`pwd`
-   prefix=${newpath}
+   binpath=${newpath}
 fi
-echo "prefix is ${configpath}"
+# OK - now we have to strip the trailing "/bin" out of the path
+prefix=`dirname ${binpath}`
+includedir=${prefix}/include
+libdir=${prefix}/lib
 
 usage()
 {
@@ -54,7 +59,7 @@ while test $# -gt 0; do
 
     case "$1" in
     --prefix)
-	echo @prefix@
+	echo ${prefix}
 	;;
 
     --version)
@@ -75,7 +80,7 @@ while test $# -gt 0; do
        	;;
 
     --include)
-       	echo -I@prefix@/include
+       	echo -I${includedir}
        	;;
 
     --ldflags)
@@ -83,7 +88,7 @@ while test $# -gt 0; do
        	;;
 
     --libs)
-       	echo -L@prefix@/lib -lCLHEP-@VERSION@ @LIBS@
+       	echo -L${libdir} -lCLHEP-@VERSION@ @LIBS@
        	;;
 
     *)