From 3e886b6bc6937d6d1a9e10a703a96b8944690ff4 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 6 Sep 2011 07:56:14 +0200 Subject: set defaults for use with dev-install --- solenv/bin/install-gdb-printers | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers index 4a643e3e78a1..16327f3ccbc1 100755 --- a/solenv/bin/install-gdb-printers +++ b/solenv/bin/install-gdb-printers @@ -28,6 +28,7 @@ GDBDIR="${SOLARENV}/gdb" SOLVERLIBDIR="${SOLARVER}/${INPATH}/lib" +INSTALLDIR="${SOLARVER}/${INPATH}/installation/opt" die() { echo "$1" >&2 @@ -91,7 +92,10 @@ while getopts :a:cfi:p:L opt; do esac done -if [[ -n ${autoloaddir} && -z ${installdir} ]]; then +if [[ -z ${autoloaddir} && -z ${installdir} ]]; then + autoloaddir="${INSTALLDIR}" + installdir="${INSTALLDIR}" +elif [[ -n ${autoloaddir} && -z ${installdir} ]]; then installdir="${autoloaddir}" elif [[ -z ${autoloaddir} && -n ${installdir} ]]; then autoloaddir="${installdir}" -- cgit