projects / packages / CiaoDE.git / blame
| Commit | Line | Data |
|---|---|---|
| 4507528d JB |
1 | --- CiaoDE-1.14.2-13646/makedir/ciaosetup_modules/group_config.sh.orig 2011-07-08 11:46:00.000000000 +0200 |
| 2 | +++ CiaoDE-1.14.2-13646/makedir/ciaosetup_modules/group_config.sh 2012-04-08 10:03:01.277155322 +0200 | |
| 3 | @@ -17,7 +17,7 @@ | |
| 4 | EOF | |
| 5 | register_command "configure" | |
| 6 | do__configure() { | |
| 7 | - run_config $* | |
| 8 | + run_config "$@" | |
| 9 | } | |
| 10 | register_command "config_prepare" | |
| 11 | do__config_prepare() { | |
| 12 | @@ -26,7 +26,7 @@ | |
| 13 | } | |
| 14 | register_command "user_config" | |
| 15 | do__user_config() { | |
| 16 | - run_config --silent=true --instype=src --sysavail=user $* | |
| 17 | + run_config --silent=true --instype=src --sysavail=user "$@" | |
| 18 | } | |
| 19 | ||
| 20 | register_command "menuconfig" | |
| 21 | @@ -50,13 +50,13 @@ | |
| 22 | #ABSSRC=${CIAODESRC}/${CIAOSRC} | |
| 23 | RUNTIME_CHECKS=$RUNTIME_CHECKS | |
| 24 | UNUSED_PRED_WARNINGS=$UNUSED_PRED_WARNINGS | |
| 25 | -CFLAGS=${EXTRA_CFLAGS} | |
| 26 | -LDFLAGS=${EXTRA_LDFLAGS} | |
| 27 | +CFLAGS="${EXTRA_CFLAGS}" | |
| 28 | +LDFLAGS="${EXTRA_LDFLAGS}" | |
| 29 | EOF | |
| 30 | } | |
| 31 | ||
| 32 | run_config() { | |
| 33 | - get_config_options $* | |
| 34 | + get_config_options "$@" | |
| 35 | ||
| 36 | if [ x$HELP = x1 ] ; then | |
| 37 | config_help | |
| 38 | @@ -111,11 +111,11 @@ | |
| 39 | HELP=1 | |
| 40 | elif expr $ARG : '\(--[^=][^=]*=..*\)' >/dev/null ; then | |
| 41 | OPT=`expr $ARG : '--\([^=][^=]*\)=..*'|sed -e s:_:-:g` | |
| 42 | - VAL=`expr $ARG : '--[^=][^=]*=\(..*\)'` | |
| 43 | + VAL="`expr $ARG : '--[^=][^=]*=\(..*\)'`" | |
| 44 | if [ x$OPT = xcflags ] ; then | |
| 45 | - EXTRA_CFLAGS=$VAL | |
| 46 | + EXTRA_CFLAGS="$VAL" | |
| 47 | elif [ x$OPT = xldflags ] ; then | |
| 48 | - EXTRA_LDFLAGS=$VAL | |
| 49 | + EXTRA_LDFLAGS="$VAL" | |
| 50 | # MAKEARG is undocumented because it is only used for debugging. | |
| 51 | elif [ x$OPT = xmakearg ] ; then | |
| 52 | MAKEARG=$VAL | |
| 53 | --- CiaoDE-1.14.2-13646/makedir/ciaosetup_modules/command_registry.sh.orig 2011-07-08 11:46:00.000000000 +0200 | |
| 54 | +++ CiaoDE-1.14.2-13646/makedir/ciaosetup_modules/command_registry.sh 2012-04-08 11:12:44.777291111 +0200 | |
| 55 | @@ -97,9 +97,9 @@ | |
| 56 | # For compatibility, register two versions of the command name, | |
| 57 | # one with '_' other with '-'. Both do the same thing. | |
| 58 | cmd2="`echo "$cmd" | sed -e 's/_/-/g'`" # replace _ by - | |
| 59 | - echo " ${cmd}) do__${cmd} "'$@'" ;;" | |
| 60 | + echo " ${cmd}) do__${cmd} \""'$@'"\" ;;" | |
| 61 | if [ "${cmd}" != "${cmd2}" ]; then | |
| 62 | - echo " ${cmd2}) do__${cmd} "'$@'" ;;" | |
| 63 | + echo " ${cmd2}) do__${cmd} \""'$@'"\" ;;" | |
| 64 | fi | |
| 65 | done | |
| 66 | echo " "'*'") do__unknown "'$act'" ;;" |