From 3164ceab4f1dd4d723a891d91cbe5c557ca6df1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Sun, 6 Feb 2011 09:10:25 +0100
Subject: [PATCH] Little adjustement concerning _() macro (maybe it s a
 compiler problem)

---
 src/view/wxUI.h        | 2 ++
 tools/package.sh       | 2 +-
 tools/package_win32.sh | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/view/wxUI.h b/src/view/wxUI.h
index 0a4342a..fab5882 100644
--- a/src/view/wxUI.h
+++ b/src/view/wxUI.h
@@ -34,8 +34,10 @@
 #include "grid/wxGridCellButtonRenderer.h"
 #include "grid/wxGridCellButtonEditor.h"
 
+#ifdef WIN32
 #undef _
 #define _(s) wxString(wxGetTranslation(s))
+#endif
 
 class KissCount;
 class ButtonPanel;
diff --git a/tools/package.sh b/tools/package.sh
index b0685a5..3649c25 100755
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%d.%m.%Y`
-ARCH=`${PREFIX}gcc -dumpmachine | cut -d- -f1`
+[ -z "$ARCH" ] && ARCH=`${PREFIX}gcc -dumpmachine | cut -d- -f1`
 VERSION=`cat src/controller/KissCount.h | grep APP_VERSION | cut -d\" -f2`
 DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}"
 FILE="$DIR.tar.bz2"
diff --git a/tools/package_win32.sh b/tools/package_win32.sh
index 4cb2d02..2aba7d2 100755
--- a/tools/package_win32.sh
+++ b/tools/package_win32.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 DATE=`date +%d.%m.%Y`
-ARCH=`${PREFIX}gcc -dumpmachine | cut -d- -f1`
+[ -z "$ARCH" ] && ARCH=`${PREFIX}gcc -dumpmachine | cut -d- -f1`
 VERSION=`cat src/controller/KissCount.h | grep APP_VERSION | cut -d\" -f2`
 DIR="KissCount_build_${VERSION}_${DATE}_${ARCH}"
 FILE="$DIR.tar.bz2"