1.1 --- a/tools/populate.in	Sat Jul 14 20:43:51 2007 +0000
     1.2 +++ b/tools/populate.in	Sat Jul 14 21:21:55 2007 +0000
     1.3 @@ -26,15 +26,15 @@
     1.4  _EOF_
     1.5  }
     1.6  
     1.7 -CT_FORCE=no
     1.8  CT_ROOT_SRC_DIR=
     1.9  CT_ROOT_DST_DIR=
    1.10 +CT_FORCE=no
    1.11  CT_ECHO=true
    1.12 -while getopts ":fs:d:vh" CT_OPT; do
    1.13 +while getopts ":s:d:fvh" CT_OPT; do
    1.14      case "${CT_OPT}" in
    1.15 -        f)  CT_FORCE=yes;;
    1.16          s)  CT_ROOT_SRC_DIR="${OPTARG}";;
    1.17          d)  CT_ROOT_DST_DIR="${OPTARG}";;
    1.18 +        f)  CT_FORCE=y;;
    1.19          v)  CT_ECHO=echo;;
    1.20          h)  doHelp
    1.21              exit 0
    1.22 @@ -57,7 +57,7 @@
    1.23      echo "$myname: \"${CT_ROOT_SRC_DIR}\": no such file or directory"
    1.24      exit 1
    1.25  fi
    1.26 -if [ -d "${CT_ROOT_DST_DIR}" -a "${CT_FORCE}" != "yes" ]; then
    1.27 +if [ -d "${CT_ROOT_DST_DIR}" -a "${CT_FORCE}" != "y" ]; then
    1.28      echo "$myname: \"${CT_ROOT_DST_DIR}\": already exists"
    1.29      exit 1
    1.30  fi
    1.31 @@ -94,8 +94,8 @@
    1.32          ${CT_ECHO} "Scanning \"${f}\""
    1.33          for libname in $("${CT_READELF}" -d "${f}" |egrep '(NEEDED)' |sed -r -e 's,.+\[(.+)\] *$,\1,;'); do
    1.34              ${CT_ECHO} "  searching for \"${libname}\""
    1.35 -            if [    -e "${CT_ROOT_DST_DIR}/lib/${libname}"     \
    1.36 -                 -o -e "${CT_ROOT_DST_DIR}/usr/lib/${libname}" ]; then
    1.37 +            if [    -e "lib/${libname}"     \
    1.38 +                 -o -e "usr/lib/${libname}" ]; then
    1.39                  ${CT_ECHO} "    already present"
    1.40                  continue
    1.41              fi
    1.42 @@ -107,9 +107,9 @@
    1.43                  libfile="${CT_SYSROOT_DIR}/${dir}/lib/${libname}"
    1.44                  ${CT_ECHO} ": \"${libfile}\""
    1.45                  if [ -e "${libfile}" ]; then
    1.46 -                    mkdir -p "${CT_ROOT_DST_DIR}/${dir}/lib"
    1.47 +                    mkdir -p "${dir}/lib"
    1.48                      ${CT_ECHO} "      installing \"${tgt_dir}/lib/${libname}\""
    1.49 -                    cp "${libfile}" "${CT_ROOT_DST_DIR}/${tgt_dir}/lib/${libname}"
    1.50 +                    cp "${libfile}" "${tgt_dir}/lib/${libname}"
    1.51                      still_needed=1
    1.52                      break
    1.53                  fi