From 4a4aa92cc05eff79d3afcd9dd8636efa5b23b20c Mon Sep 17 00:00:00 2001
From: William Kendrick <wkendrick@users.sourceforge.net>
Date: Tue, 27 May 2008 21:10:31 +0000
Subject: [PATCH] BeOS tweaks from Begasus.

---
 Makefile       | 4 ++--
 src/i18n.c     | 7 +++++--
 src/tuxpaint.c | 6 ++++--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 51624d183..fae9401e5 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 # bill@newbreedsoftware.com
 # http://www.tuxpaint.org/
 
-# June 14, 2002 - April 3, 2008
+# June 14, 2002 - May 27, 2008
 
 
 # The version number, for release:
@@ -87,7 +87,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
 # Where things will go when ultimately installed:
 windows_PREFIX:=/usr/local
 osx_PREFIX:=/usr/local
-beos_PREFIX:=/boot/apps/Games
+beos_PREFIX:=/boot/apps/Games/TuxPaint
 linux_PREFIX:=/usr/local
 PREFIX:=$($(OS)_PREFIX)
 
diff --git a/src/i18n.c b/src/i18n.c
index ff494e8cd..c198c9452 100644
--- a/src/i18n.c
+++ b/src/i18n.c
@@ -25,7 +25,7 @@
 
   $Id$
 
-  June 14, 2002 - April 28, 2008
+  June 14, 2002 - May 27, 2008
 */
 
 #include <stdio.h>
@@ -56,8 +56,11 @@
 
 #ifndef OLD_UPPERCASE_CODE
 #include <wctype.h>
-#elif __BEOS__
+#else
+#if defined (__BEOS__) && !defined (__HAIKU__)
 #include <wchar.h>
+#else
+#endif
 #endif
 
 
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index cd73dde65..4896522b2 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -22,7 +22,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   (See COPYING.txt)
   
-  June 14, 2002 - March 4, 2008
+  June 14, 2002 - May 27, 2008
   $Id$
 */
 
@@ -223,9 +223,11 @@ char *strcasestr(const char *haystack, const char *needle)
 
 #ifndef OLD_UPPERCASE_CODE
 #include <wctype.h>
-#elif __BEOS__
+#else
+#if defined (__BEOS__) && !defined (__HAIKU__)
 #include <wchar.h>
 #endif
+#endif
 
 #include <libintl.h>
 #ifndef gettext_noop