1.1 --- a/configure	Wed Jun 11 20:40:38 2008 +0000
     1.2 +++ b/configure	Tue Jun 24 16:24:09 2008 +0000
     1.3 @@ -113,11 +113,6 @@
     1.4      set_mandir "" $(pwd)/docs
     1.5  fi
     1.6  
     1.7 -[ -z "${BINDIR_set}" ] && BINDIR="${PREFIX}/bin"
     1.8 -[ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib/ct-ng-${VERSION}"
     1.9 -[ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc/ct-ng-${VERSION}"
    1.10 -[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man/man1"
    1.11 -
    1.12  #---------------------------------------------------------------------
    1.13  # Some sanity checks, now
    1.14  
    1.15 @@ -129,17 +124,24 @@
    1.16      REVISION=$(LC_ALL=C svnversion)
    1.17      case "${REVISION}" in
    1.18        exported)
    1.19 -        VERSION="${VERSION}:unknown@$(date +%Y%m%d.%H%M%S)";;
    1.20 +        VERSION="${VERSION}unknown@$(date +%Y%m%d.%H%M%S)";;
    1.21        *)
    1.22          URL=$(LC_ALL=C svn info 2>/dev/null |egrep 'URL: ' |cut -d ' ' -f 2-)
    1.23          ROOT=$(LC_ALL=C svn info 2>/dev/null |egrep 'Repository Root: ' |cut -d ' ' -f 3-)
    1.24 -        VERSION="${VERSION}:${URL#${ROOT}}@${REVISION}"
    1.25 +        VERSION="${VERSION}${URL#${ROOT}}@${REVISION}"
    1.26          ;;
    1.27      esac
    1.28 +    VERSION="${VERSION/\//_}"
    1.29      ;;
    1.30  esac
    1.31  echo "${VERSION}"
    1.32  
    1.33 +# Now we have the version string, we can buyild up the paths
    1.34 +[ -z "${BINDIR_set}" ] && BINDIR="${PREFIX}/bin"
    1.35 +[ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib/ct-ng-${VERSION}"
    1.36 +[ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc/ct-ng-${VERSION}"
    1.37 +[ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man/man1"
    1.38 +
    1.39  # Check bash is present, and at least version 3.0
    1.40  echo -n "Checking bash is at least bash-3.0... "
    1.41  [ -x /bin/bash ] || do_error "bash 3.0 or above was not found in /bin/bash"
    1.42 @@ -161,9 +163,9 @@
    1.43  
    1.44  cat <<__EOF__
    1.45  crosstool-NG configured as follows:
    1.46 -  PREFIX="${PREFIX}"
    1.47 -  BINDIR="${BINDIR}"
    1.48 -  LIBDIR="${LIBDIR}"
    1.49 -  DOCDIR="${DOCDIR}"
    1.50 -  MANDIR="${MANDIR}"
    1.51 +  PREFIX='${PREFIX}'
    1.52 +  BINDIR='${BINDIR}'
    1.53 +  LIBDIR='${LIBDIR}'
    1.54 +  DOCDIR='${DOCDIR}'
    1.55 +  MANDIR='${MANDIR}'
    1.56  __EOF__