1.1 --- a/bin/caam	Mon Jun 10 10:23:51 2013 +0900
     1.2 +++ b/bin/caam	Mon Jun 10 10:25:44 2013 +0900
     1.3 @@ -1,8 +1,8 @@
     1.4  #!/bin/sh
     1.5  # caam - Configure And And Make
     1.6 -# (C)2008-2011 by HIROSE, Yuuji [yuuji/at/gentei.org]
     1.7 -# Last modified Wed Sep 23 06:16:25 2009 on firestorm
     1.8 -# Update count: 14
     1.9 +# (C)2008-2012 by HIROSE, Yuuji [yuuji/at/gentei.org]
    1.10 +# Last modified Mon Jul 30 08:09:22 2012 on firestorm
    1.11 +# Update count: 40
    1.12  # http://www.gentei.org/~yuuji/software/caam/
    1.13  
    1.14  ca=`echo $CAAM_ADD|tr : ' '`
    1.15 @@ -113,8 +113,9 @@
    1.16  
    1.17  # Save old variable
    1.18  acvars=`env|grep '^ac_'|cut -d= -f 1`
    1.19 -otvars=`env|egrep '(_CFLAGS|_LIBS|_INCLUDES)='|cut -d= -f 1`
    1.20 +otvars=`env|egrep '(_CFLAGS|_LIBS?|_INCLUDES?)='|cut -d= -f 1`
    1.21  for e in PATH LD_LIBRARY_PATH LD_RUN_PATH PERL RUBY PYTHON M4 \
    1.22 +		LIBTOOL SED INSTALL MAKE MSGFMT \
    1.23  		CC CFLAGS LDFLAGS LIBS CXX CXXFLAGS \
    1.24  		CONFIG_SHELL \
    1.25    		PKG_CONFIG_PATH CAAM_PREFIXES CAAM_ADD CFG MAKE MKOPT \
    1.26 @@ -158,17 +159,34 @@
    1.27  successlog() {
    1.28   status=$?
    1.29   (PWD=`pwd`				  # for compatibility
    1.30 +  uname=`uname -sm 2>/dev/null`
    1.31    logfile=../`basename $PWD`.caam
    1.32    [ -s $logfile ] || echo "### $logfile started at `date`" > $logfile
    1.33    (echo 1i
    1.34 -   echo "# $myname succeeded at `date`"
    1.35 +   echo "# ** $uname ** - $myname succeeded at `date`"
    1.36 +   cat <<EOF
    1.37 +if [ x"\`uname -sm\`" = x"$uname" ]; then
    1.38 +  if [ x"\$1" = x"-n" ]; then
    1.39 +    sed -n -e '1,/#[:]BEGIN/d' -e '/^  exit\$/q' -e p \$0 \\
    1.40 +      | sed -e 's/^  *//' -e 's/ "\$@"//' \\
    1.41 +      | sed "s,\$PATH,\\\$PATH,"|sed '/PATH="\\\$PATH" /d'
    1.42 +    exit 0
    1.43 +  fi
    1.44 +  #:BEGIN
    1.45 +EOF
    1.46     for e in $kept_env; do
    1.47       eval v="\$old_$e"
    1.48 -     echo $e=\"$v\" \\
    1.49 +     echo "  "$e=\"$v\" \\
    1.50     done
    1.51 -   echo $myname $myargs
    1.52 -   echo exit
    1.53 +   echo "  $myname" $myargs '"$@"'
    1.54 +   echo "  exit"
    1.55 +   echo "fi"
    1.56 +   echo "#### ** $uname Success log ends here."
    1.57     echo .; echo w; echo q) | ed $logfile 2> /dev/null
    1.58 +
    1.59 +   echo "Saved caam log in $logfile."
    1.60 +   echo "To build again with same parameters:    sh $logfile"
    1.61 +   echo "To see successfull caam arguments:      sh $logfile -n"
    1.62    )
    1.63    exit $status
    1.64  }