[Gpa-commits] r914 - trunk

[scm-commit@wald.intevation.org]

Author: marcus
Date: 2008-12-04 16:46:58 +0100 (Thu, 04 Dec 2008)
New Revision: 914

Modified:
   trunk/ChangeLog
   trunk/configure.ac
Log:
2008-12-04  Marcus Brinkmann  <marcus at g10code.com>

	* configure.ac (GPA_LOCALEDIR): Fix definition.
	(gpadefs.h): Remove DATADIRNAME, add localedir.
	Submitted by gozer at progrock.com.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-12-04 15:44:45 UTC (rev 913)
+++ trunk/ChangeLog	2008-12-04 15:46:58 UTC (rev 914)
@@ -1,3 +1,9 @@
+2008-12-04  Marcus Brinkmann  <marcus at g10code.com>
+
+	* configure.ac (GPA_LOCALEDIR): Fix definition.
+	(gpadefs.h): Remove DATADIRNAME, add localedir.
+	Submitted by gozer at progrock.com.
+
 2008-10-31  gettextize  <bug-gnu-gettext at gnu.org>
 
 	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.17.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-12-04 15:44:45 UTC (rev 913)
+++ trunk/configure.ac	2008-12-04 15:46:58 UTC (rev 914)
@@ -277,7 +277,7 @@
   #define GPG_PROGRAM   "c:/gnupg/gpg"
   #define GPA_KEYSERVER_HELPERS_DIR "c:/gnupg"
 #else
-  #define GPA_LOCALEDIR "${prefix}/${DATADIRNAME}/locale"
+  #define GPA_LOCALEDIR "${datadir}${localedir}"
   #define GPA_DATADIR   "${datadir}/gpa"
   #define GPG_PROGRAM   "${GPG}"
   #define GPA_KEYSERVER_HELPERS_DIR "$KEYSERVER_HELPERS_DIR"
@@ -297,7 +297,7 @@
 libdir=$libdir
 KEYSERVER_HELPERS_DIR=$KEYSERVER_HELPERS_DIR
 datadir=$datadir
-DATADIRNAME=$DATADIRNAME
+localedir=$localedir
 GPG=$GPG
 ]])