1.1 --- a/configure	Sun Jul 01 20:52:34 2007 +0000
     1.2 +++ b/configure	Sun Jul 01 21:21:11 2007 +0000
     1.3 @@ -4,15 +4,12 @@
     1.4  DATE=$(date +%Y%m%d)
     1.5  
     1.6  PREFIX_DEFAULT=/usr/local
     1.7 -BINDIR_DEFAULT="${PREFIX}/bin"
     1.8 -LIBDIR_DEFAULT="${PREFIX}/lib"
     1.9 -DOCDIR_DEFAULT="${PREFIX}/share/doc"
    1.10 -MANDIR_DEFAULT="${PREFIX}/share/man"
    1.11  
    1.12  BINDIR_set=
    1.13  LIBDIR_set=
    1.14  DOCDIR_set=
    1.15  MANDIR_set=
    1.16 +LOCAL_set=
    1.17  
    1.18  get_optval(){
    1.19      local ret
    1.20 @@ -34,9 +31,9 @@
    1.21      PREFIX=$(get_optval "$1" "$2")
    1.22      ret=$?
    1.23      [ -z "${BINDIR_set}" ] && BINDIR="${PREFIX}/bin"
    1.24 -    [ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib"
    1.25 -    [ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc"
    1.26 -    [ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man"
    1.27 +    [ -z "${LIBDIR_set}" ] && LIBDIR="${PREFIX}/lib/ct-ng-${VERSION}"
    1.28 +    [ -z "${DOCDIR_set}" ] && DOCDIR="${PREFIX}/share/doc/ct-ng-${VERSION}"
    1.29 +    [ -z "${MANDIR_set}" ] && MANDIR="${PREFIX}/share/man/man1"
    1.30      return ${ret}
    1.31  }
    1.32  
    1.33 @@ -82,8 +79,8 @@
    1.34  
    1.35  Configuration:
    1.36    -h, --help              display this help and exit                                                                                                                  
    1.37 -  --prefix=PREFIX         install architecture-independent files in PREFIX
    1.38 -                          [${PREFIX_DEFAULT}]
    1.39 +  --prefix=PREFIX         install files in PREFIX [${PREFIX_DEFAULT}]
    1.40 +  --local                 don't install, and use current directory
    1.41  
    1.42  By default, \`make install' will install all the files in
    1.43  \`${PREFIX_DEFAULT}/bin', \`${PREFIX_DEFAULT}/lib' etc.  You can specify
    1.44 @@ -107,12 +104,20 @@
    1.45          --libdir*)  set_libdir "$1" "$2" && shift || shift 2;;
    1.46          --docdir*)  set_docdir "$1" "$2" && shift || shift 2;;
    1.47          --mandir*)  set_mandir "$1" "$2" && shift || shift 2;;
    1.48 +        --local)    LOCAL_set=1; shift;;
    1.49          --help|-h)  do_help; exit 0;;
    1.50          *)          do_help; exit 1;;
    1.51      esac
    1.52  done
    1.53  
    1.54 -[ -z "${PREFIX}" ] && set_prefix --prefix "${PREFIX_DEFAULT}"
    1.55 +[ -z "${PREFIX}" ] && set_prefix "" "${PREFIX_DEFAULT}"
    1.56 +if [ "${LOCAL_set}" = "1" ]; then
    1.57 +    set_prefix "" $(pwd)
    1.58 +    set_bindir "" $(pwd)
    1.59 +    set_libdir "" $(pwd)
    1.60 +    set_docdir "" $(pwd)/docs
    1.61 +    set_mandir "" $(pwd)/docs
    1.62 +fi
    1.63  
    1.64  sed -r -e "s,@@BINDIR@@,${BINDIR},g;"   \
    1.65         -e "s,@@LIBDIR@@,${LIBDIR},g;"   \
    1.66 @@ -120,4 +125,14 @@
    1.67         -e "s,@@MANDIR@@,${MANDIR},g;"   \
    1.68         -e "s,@@VERSION@@,${VERSION},g;" \
    1.69         -e "s,@@DATE@@,${DATE},g;"       \
    1.70 -        Makefile.in >Makefile
    1.71 +       -e "s,@@LOCAL@@,${LOCAL_set},g;" \
    1.72 +       Makefile.in >Makefile
    1.73 +
    1.74 +cat <<__EOF__
    1.75 +ct-ng configured as follows:
    1.76 +  PREFIX="${PREFIX}"
    1.77 +  BINDIR="${BINDIR}"
    1.78 +  LIBDIR="${LIBDIR}"
    1.79 +  DOCDIR="${DOCDIR}"
    1.80 +  MANDIR="${MANDIR}"
    1.81 +__EOF__