Merge branch 'master' of pwrcvs:/data1/git/pwr

otherio/exe/rt_powerlink_cn/src/rt_powerlink_cn.c

@@ -34,6 +34,7 @@
  * General Public License plus this exception.
  **/
 
+#if defined EPL
 
 #include "pwr.h"
 #include "rt_io_msg.h"
@@ -128,8 +129,17 @@ int main()
     sts = io_read(io_ctx);
     sts = io_write(io_ctx); 
     nanosleep(&tim1, &tim2);
-    aproc_TimeStamp( plhp->CycleTime, 5.0);
+    aproc_''TimeStamp( plhp->CycleTime, 5.0);
   }
 }
 
+#else
+
+#include <stdio.h>
+
+int main() 
+{
+  printf("** Not built with Powerlink\n");
+}
+#endif
 

src/tools/pwre/src/os_linux/pwre_configure.sh

@@ -277,6 +277,9 @@ if [ ${machine:0:3} == "arm" ]; then
   hwpl=arm
 else
   ubuntu_ver=`cat /etc/issue | grep Ubuntu | awk '{ print $2 }'`
+  if [ "$ubuntu_ver" == "" ]; then
+    ubuntu_ver=`cat /etc/issue | grep Mint | awk '{ print $3 }'`
+  fi
   if [ "$ubuntu_ver" != "" ] &&[ "$ubuntu_ver" != "12.04" ] && [ $hwpl == "i686" ] ; then
     hwpl=i386
   fi