[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-394-ge8688ab

[jscheer <js...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".

The branch, master has been updated
       via  e8688ab7d260b00137c87b478effa9b6140d2902 (commit)
       via  30775a1ba654e60eab4cd120d63f1bbf3c7995f2 (commit)
      from  b45f65273171887cf3f982269f0d48ddbad66300 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e8688ab7d260b00137c87b478effa9b6140d2902
Merge: 30775a1 b45f652
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Jun 19 10:50:50 2012 +0200

    Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus

commit 30775a1ba654e60eab4cd120d63f1bbf3c7995f2
Author: Jeremie Scheer <jer...@ar...>
Date:   Tue Jun 19 10:50:14 2012 +0200

    [DEMOS] Fix mkspecs path for APF build in ApfDacClientServer demo's build.sh.

-----------------------------------------------------------------------

Summary of changes:
 software/demos/ApfDacClientServer/src/build.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/software/demos/ApfDacClientServer/src/build.sh b/software/demos/ApfDacClientServer/src/build.sh
index 642f9cf..70ca5d3 100755
--- a/software/demos/ApfDacClientServer/src/build.sh
+++ b/software/demos/ApfDacClientServer/src/build.sh
@@ -88,7 +88,7 @@ export OUTPUT_DIR=../../bin/apf
 #export QTDIR=$ARMADEUS_ROOTFS_DIR/qt/qtopia.4.2.0/
 export QTDIR=$ARMADEUS_QTE_DIR
 ## due to some installation problems.... I use a custom qmake spec
-export QMAKESPEC=$ARMADEUS_BUILDROOT_DIR/output/host/usr/mkspecs/qws/linux-arm-g++
+export QMAKESPEC=$ARMADEUS_QTE_DIR/mkspecs/qws/linux-arm-g++
 export PATH=$ARMADEUS_TOOLCHAIN_PATH:$QTDIR/bin:$INITIALPATH
 
 buildForEnvironment "APF board" $1


hooks/post-receive
-- 
armadeus