From 50f951fc4974ef659adac76897b39be9dc45f4a9 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Fri, 8 Jul 2011 23:12:58 +0400 Subject: [PATCH] =?UTF-8?q?REP=5FINCLUDE=20=D0=BF=D0=BE=D0=B4=D0=BF=D1=80?= =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bash/smake/smake.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bash/smake/smake.sh b/bash/smake/smake.sh index 6942982..398ab9d 100755 --- a/bash/smake/smake.sh +++ b/bash/smake/smake.sh @@ -38,7 +38,7 @@ while true ; do ;; -c|--cc) REP_CC=$2 ; echo "CC=$REP_CC" ; shift 2 ;; -x|--cxx) REP_CXX=$2 ; echo "CXX=$REP_CXX" ; shift 2 ;; - -i|--include) [ $include_changed == false ] && REP_INCLUDE="" && include_changed=true; REP_INCLUDE="$REP_INCLUDE $2" ; shift 2 ;; + -i|--include) [ $include_changed == false ] && REP_INCLUDE="" && include_changed=true; REP_INCLUDE="$REP_INCLUDE `echo $2 | sed "s~^${HOME}~\$\(HOME\)~g ; s~/*$~~g"`" ; shift 2 ;; -l|--libraries) REP_LIBRARIES=$2 ; echo "LIBRARIES=$REP_LIBRARIES"; shift 2 ;; -t|--target) REP_TARGET=$2 ; echo "TARGET=$REP_TARGET"; shift 2 ;; --) shift ; break ;; @@ -46,6 +46,9 @@ while true ; do esac done +# ======= Show INCLUDES ======= +echo "INCLUDE=$REP_INCLUDE"; + # ======= Help ======= cat $HELP_FILE > Makefile echo >> Makefile @@ -57,10 +60,6 @@ echo >> Makefile sed "s~REP_CC~$REP_CC~ ; s~REP_CXX~$REP_CXX~ ; \ s~REP_LIBRARIES~$REP_LIBRARIES~ ; s~REP_TARGET~$REP_TARGET~" $ENV_FILE >> Makefile -# INCLUDE0, INCLUDE1, INCLUDE2, ... -REP_INCLUDE=`echo $REP_INCLUDE | sed 's~\~~$(HOME)~g ; s~/*$~~'` -echo "INCLUDE=$REP_INCLUDE"; - i=1 for d in $REP_INCLUDE; do echo "INCLUDE$i=$d" >> Makefile