Skip to content
Snippets Groups Projects
Commit ffb050a2 authored by Fons Rademakers's avatar Fons Rademakers
Browse files

add flag --bindir to root-config.

git-svn-id: http://root.cern.ch/svn/root/trunk@9082 27541ba8-7e3a-0410-8455-c3a389f83636
parent 7e0d5ab6
Branches
Tags
No related merge requests found
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# Author: Fons Rademakers, 06/06/99 # Author: Fons Rademakers, 06/06/99
arch=@architecture@ arch=@architecture@
bindir=@bindir@
libdir=@libdir@ libdir=@libdir@
incdir=@incdir@ incdir=@incdir@
features="@features@" features="@features@"
...@@ -13,8 +14,9 @@ if test "$arch" = "win32gdk"; then ...@@ -13,8 +14,9 @@ if test "$arch" = "win32gdk"; then
arch="win32" arch="win32"
fi fi
if test "$arch" = "win32"; then if test "$arch" = "win32"; then
incdir=`cygpath -u $incdir` bindir=`cygpath -u $bindir`
libdir=`cygpath -u $libdir` libdir=`cygpath -u $libdir`
incdir=`cygpath -u $incdir`
fi fi
### ROOT libraries ### ### ROOT libraries ###
...@@ -347,7 +349,7 @@ noauxcflags=no ...@@ -347,7 +349,7 @@ noauxcflags=no
noldflags=no noldflags=no
usage="\ usage="\
Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--new] [--nonew] [--libs] [--glibs] [--libdir] [--incdir] [--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch] [--help]" Usage: root-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--new] [--nonew] [--libs] [--glibs] [--bindir] [--libdir] [--incdir] [--noauxcflags] [--noauxlibs] [--noldflags] [--has-<feature>] [--arch] [--help]"
if test $# -eq 0; then if test $# -eq 0; then
echo "${usage}" 1>&2 echo "${usage}" 1>&2
...@@ -387,12 +389,14 @@ while test $# -gt 0; do ...@@ -387,12 +389,14 @@ while test $# -gt 0; do
optarg=`cygpath -u $optarg` optarg=`cygpath -u $optarg`
fi fi
prefix=$optarg prefix=$optarg
incdir=${prefix}/include bindir=${prefix}/bin
libdir=${prefix}/lib libdir=${prefix}/lib
incdir=${prefix}/include
### We need to expand the path to backslash seperated path ### We need to expand the path to backslash seperated path
if test "$arch" = "win32"; then if test "$arch" = "win32"; then
incdir=`cygpath -u $incdir` bindir=`cygpath -u $bindir`
libdir=`cygpath -u $libdir` libdir=`cygpath -u $libdir`
incdir=`cygpath -u $incdir`
fi fi
if test $exec_prefix_set = no ; then if test $exec_prefix_set = no ; then
exec_prefix=$optarg exec_prefix=$optarg
...@@ -409,9 +413,11 @@ while test $# -gt 0; do ...@@ -409,9 +413,11 @@ while test $# -gt 0; do
fi fi
exec_prefix=$optarg exec_prefix=$optarg
exec_prefix_set=yes exec_prefix_set=yes
bindir=${exec_prefix}/bin
libdir=${exec_prefix}/lib libdir=${exec_prefix}/lib
### We need to expand the path to backslash seperated path ### We need to expand the path to backslash seperated path
if test "$arch" = "win32"; then if test "$arch" = "win32"; then
bindir=`cygpath -u $bindir`
libdir=`cygpath -u $libdir` libdir=`cygpath -u $libdir`
fi fi
;; ;;
...@@ -538,6 +544,10 @@ while test $# -gt 0; do ...@@ -538,6 +544,10 @@ while test $# -gt 0; do
### output the auxiliary libraries ### output the auxiliary libraries
out="$out $auxlibs" out="$out $auxlibs"
;; ;;
--bindir)
### output the executable directory
out="$out $bindir"
;;
--libdir) --libdir)
### output the library directory ### output the library directory
out="$out $libdir" out="$out $libdir"
...@@ -556,6 +566,7 @@ while test $# -gt 0; do ...@@ -556,6 +566,7 @@ while test $# -gt 0; do
echo " --libs Print regular ROOT libraries" echo " --libs Print regular ROOT libraries"
echo " --glibs Print regular + GUI ROOT libraries" echo " --glibs Print regular + GUI ROOT libraries"
echo " --cflags Print compiler flags and header path" echo " --cflags Print compiler flags and header path"
echo " --bindir Print the executable directory"
echo " --libdir Print the library directory" echo " --libdir Print the library directory"
echo " --incdir Print the header directory" echo " --incdir Print the header directory"
echo " --auxlibs Print auxiliary libraries" echo " --auxlibs Print auxiliary libraries"
......
...@@ -2654,10 +2654,12 @@ echo "done" ...@@ -2654,10 +2654,12 @@ echo "done"
# #
message "Writing $RCONFOUT" message "Writing $RCONFOUT"
prefix2=$prefix prefix2=$prefix
incdir2=$incdir bindir2=$bindir
libdir2=$libdir libdir2=$libdir
incdir2=$incdir
if test "$prefix2" = "\$(ROOTSYS)" ; then if test "$prefix2" = "\$(ROOTSYS)" ; then
prefix2=\$ROOTSYS prefix2=\$ROOTSYS
bindir2=\$ROOTSYS/bin
libdir2=\$ROOTSYS/lib libdir2=\$ROOTSYS/lib
incdir2=\$ROOTSYS/include incdir2=\$ROOTSYS/include
fi fi
...@@ -2671,8 +2673,9 @@ for f in $options ; do ...@@ -2671,8 +2673,9 @@ for f in $options ; do
done done
sed -e "s|@architecture@|$arch|" \ sed -e "s|@architecture@|$arch|" \
-e "s|@prefix@|$prefix2|" \ -e "s|@prefix@|$prefix2|" \
-e "s|@incdir@|$incdir2|" \ -e "s|@bindir@|$bindir2|" \
-e "s|@libdir@|$libdir2|" \ -e "s|@libdir@|$libdir2|" \
-e "s|@incdir@|$incdir2|" \
-e "s|@features@|$features|" \ -e "s|@features@|$features|" \
< root-config.tmp > $RCONFOUT < root-config.tmp > $RCONFOUT
rm -f root-config.tmp rm -f root-config.tmp
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment