From: Frédéric Marchal <fmarchal@users.sourceforge.net>
Date: Sat, 18 Sep 2010 12:32:48 +0000 (+0000)
Subject: Use the directory configured by the user for the files to put in --localedir.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6bb2f4dd36fdd763a0d5108dc0a7d502da7b2c5;p=thirdparty%2Fsarg.git

Use the directory configured by the user for the files to put in --localedir.
---

diff --git a/ChangeLog b/ChangeLog
index 462a87d..e353c95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 SARG ChangeLog
 
-Jul-12-2010 Version 2.3.1
+Jul-14-2010 Version 2.3.1
 		- Remove the distinct printf for the alpha architecture as it doesn't work anymore and is not necessary anyway.
+		- Don't abort if "onload" or "script" is found in the user agent string.
+		- Take the configured locale path into account when installing sarg.
 
 Jun-21-2010 Version 2.3
 		- LDAP usertab added. 
diff --git a/Makefile.in b/Makefile.in
index 7b30d53..3e2c64a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,6 @@ prefix=@prefix@
 datarootdir=@datarootdir@
 datadir=@datadir@
 exec_prefix=@exec_prefix@
-localedir   = $(datadir)/locale
 PACKAGE_TARNAME=@PACKAGE_TARNAME@
 docdir      = @docdir@
 CC          = @CC@
@@ -19,7 +18,7 @@ ISYSCONFDIR = -DSYSCONFDIR=\"@sysconfdir@\"
 ISARGPHPDIR = -DSARGPHPDIR=\"@SARGPHPDIR@\"
 IFONTDIR    = -DFONTDIR=\"@FONTDIR@\"
 IIMAGEDIR   = -DIMAGEDIR=\"@IMAGEDIR@\"
-ILOCALEDIR  = -DLOCALEDIR=\"$(localedir)\"
+ILOCALEDIR  = -DLOCALEDIR=\"@localedir@\"
 CFLAGS      = @CFLAGS@
 CPPFLAGS    = @CPPFLAGS@
 LDFLAGS     = @LDFLAGS@