1.1 --- a/bin/caam	Tue Feb 27 08:35:07 2018 +0900
     1.2 +++ b/bin/caam	Thu Mar 01 12:50:22 2018 +0900
     1.3 @@ -53,6 +53,8 @@
     1.4  WRAPDIR=$mytop/wrap
     1.5  [ "$CAAM_DEBUG" ] && echo wrapdir=$WRAPDIR
     1.6  SUSPEND=:
     1.7 +build_subdir=build.caam
     1.8 +builddir=""
     1.9  CAAM_LOG=true
    1.10  logsuffix=${CAAM_LOGSUFFIX:-$myname}
    1.11  if [ -w .. ]; then
    1.12 @@ -71,6 +73,7 @@
    1.13  	  -m		Do make only, not calling configure
    1.14  	  -c		Do configure only, not calling make
    1.15  	  -g		Call "gmake" instead of default "make"
    1.16 +	  -cmake	Call "cmake" instead of default "./configure"
    1.17  	  -mai, -gmai	"make all install", "gmake all install"
    1.18  	  -maic, -gmaic	"make all install clean", ditto for gmake
    1.19  	  -t TGT	Set TGT as "make" target instead of "all"
    1.20 @@ -82,6 +85,7 @@
    1.21  	  -l		Replace ./libtool to that of the system
    1.22  	  -o LOG	Output log to LOG (default: $logfile)
    1.23  	  -d		Debug information
    1.24 +	  --		End of caam-options
    1.25  
    1.26  	Available environment variables:
    1.27  	  CAAM_PREFIXES		Reset default prefix
    1.28 @@ -109,7 +113,7 @@
    1.29  # Parse my own arguments
    1.30  while [ x"" != x"$1" ]; do
    1.31    case "$1" in
    1.32 -    --)		break;;
    1.33 +    --)		shift; break;;
    1.34      -help|--help)	usage ;;
    1.35      -gmaic)	TGT2="install clean"; CAAM_MAKE=gmake;;
    1.36      -maic)	TGT2="install clean";;
    1.37 @@ -124,11 +128,13 @@
    1.38  #    -CC)	setcc=1 ;;
    1.39      -c)		DO="echo done";;
    1.40      -g)		CAAM_MAKE=gmake ;;
    1.41 +    -cmake)	CAAM_CFG=cmake; builddir=$build_subdir ;;
    1.42      -s)		shift; SUSPEND="dosleep $1" ;;
    1.43      -S)		SUSPEND=suspend ;;
    1.44      -d)		debug=1 ;;
    1.45      -h)		shift; HOOK="$1" ;;
    1.46      -l)		LIBTOOLHACK=1 ;;
    1.47 +    -o)		shift; logfile="$1" ;;
    1.48      *)		break ;;
    1.49    esac
    1.50    shift