# HG changeset patch
# User tuomov
# Date 1391696173 0
# Node ID c7ad4b23a277176144d4f047b38aaafbdef6e74a
# Parent  5f66d3bb1c686de99bfb908d4f644e00589b68b3
	locale.h name seems to conflict with system locale.h name on some systems

diff -r 5f66d3bb1c68 -r c7ad4b23a277 locale.h
--- a/locale.h	Fri Mar 15 10:12:47 2013 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
- * libtu/locale.h
- *
- * Copyright (c) Tuomo Valkonen 2004. 
- *
- * You may distribute and modify this library under the terms of either
- * the Clarified Artistic License or the GNU LGPL, version 2.1 or later.
- */
-
-#ifndef LIBTU_LOCALE_H
-#define LIBTU_LOCALE_H
-
-#ifdef CF_NO_GETTEXT
-
-#define TR(X) X
-#define DUMMY_TR(X) X
-
-#else
-
-#include <libintl.h>
-
-#define TR(X) gettext(X)
-#define DUMMY_TR(X) X
-
-#endif
-
-#endif /* LIBTU_LOCALE_H */
diff -r 5f66d3bb1c68 -r c7ad4b23a277 localex.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/localex.h	Thu Feb 06 14:16:13 2014 +0000
@@ -0,0 +1,27 @@
+/*
+ * libtu/locale.h
+ *
+ * Copyright (c) Tuomo Valkonen 2004. 
+ *
+ * You may distribute and modify this library under the terms of either
+ * the Clarified Artistic License or the GNU LGPL, version 2.1 or later.
+ */
+
+#ifndef LIBTU_LOCALE_H
+#define LIBTU_LOCALE_H
+
+#ifdef CF_NO_GETTEXT
+
+#define TR(X) X
+#define DUMMY_TR(X) X
+
+#else
+
+#include <libintl.h>
+
+#define TR(X) gettext(X)
+#define DUMMY_TR(X) X
+
+#endif
+
+#endif /* LIBTU_LOCALE_H */
diff -r 5f66d3bb1c68 -r c7ad4b23a277 prefix.c
--- a/prefix.c	Fri Mar 15 10:12:47 2013 +0000
+++ b/prefix.c	Thu Feb 06 14:16:13 2014 +0000
@@ -9,7 +9,7 @@
 
 #include <string.h>
 #include "misc.h"
-#include "locale.h"
+#include "localex.h"
 #include "output.h"
 
 static char *the_prefix=NULL;
diff -r 5f66d3bb1c68 -r c7ad4b23a277 system.mk
--- a/system.mk	Fri Mar 15 10:12:47 2013 +0000
+++ b/system.mk	Thu Feb 06 14:16:13 2014 +0000
@@ -7,7 +7,7 @@
 ## Installation paths
 ##
 
-PREFIX=/usr/local/
+PREFIX=/data/usr
 
 # No need to modify these usually
 BINDIR=$(PREFIX)/bin
diff -r 5f66d3bb1c68 -r c7ad4b23a277 util.c
--- a/util.c	Fri Mar 15 10:12:47 2013 +0000
+++ b/util.c	Thu Feb 06 14:16:13 2014 +0000
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "locale.h"
+#include "localex.h"
 #include "util.h"
 #include "misc.h"