# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1519876222 -32400
# Node ID a74630a971bf3ff9ec02c93aa637b2b3c5c13ce5
# Parent  a2eab6cbd1a0bf721ec35900aa4a485d1fabfaef
-o option forgotten

diff -r a2eab6cbd1a0 -r a74630a971bf bin/caam
--- a/bin/caam	Tue Feb 27 08:35:07 2018 +0900
+++ b/bin/caam	Thu Mar 01 12:50:22 2018 +0900
@@ -53,6 +53,8 @@
 WRAPDIR=$mytop/wrap
 [ "$CAAM_DEBUG" ] && echo wrapdir=$WRAPDIR
 SUSPEND=:
+build_subdir=build.caam
+builddir=""
 CAAM_LOG=true
 logsuffix=${CAAM_LOGSUFFIX:-$myname}
 if [ -w .. ]; then
@@ -71,6 +73,7 @@
 	  -m		Do make only, not calling configure
 	  -c		Do configure only, not calling make
 	  -g		Call "gmake" instead of default "make"
+	  -cmake	Call "cmake" instead of default "./configure"
 	  -mai, -gmai	"make all install", "gmake all install"
 	  -maic, -gmaic	"make all install clean", ditto for gmake
 	  -t TGT	Set TGT as "make" target instead of "all"
@@ -82,6 +85,7 @@
 	  -l		Replace ./libtool to that of the system
 	  -o LOG	Output log to LOG (default: $logfile)
 	  -d		Debug information
+	  --		End of caam-options
 
 	Available environment variables:
 	  CAAM_PREFIXES		Reset default prefix
@@ -109,7 +113,7 @@
 # Parse my own arguments
 while [ x"" != x"$1" ]; do
   case "$1" in
-    --)		break;;
+    --)		shift; break;;
     -help|--help)	usage ;;
     -gmaic)	TGT2="install clean"; CAAM_MAKE=gmake;;
     -maic)	TGT2="install clean";;
@@ -124,11 +128,13 @@
 #    -CC)	setcc=1 ;;
     -c)		DO="echo done";;
     -g)		CAAM_MAKE=gmake ;;
+    -cmake)	CAAM_CFG=cmake; builddir=$build_subdir ;;
     -s)		shift; SUSPEND="dosleep $1" ;;
     -S)		SUSPEND=suspend ;;
     -d)		debug=1 ;;
     -h)		shift; HOOK="$1" ;;
     -l)		LIBTOOLHACK=1 ;;
+    -o)		shift; logfile="$1" ;;
     *)		break ;;
   esac
   shift