From cb69cca6754c7d2553e8c584f4c542d7faf426f3 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 10 Oct 2009 08:03:27 +0000 Subject: [PATCH] 2009-10-10 Tatsuhiro Tsujikawa Don't set localedir manually. Leave it to autoconf. * configure.ac * src/Makefile.am --- ChangeLog | 6 ++++++ configure | 4 ---- configure.ac | 4 ---- src/Makefile.am | 2 +- src/Makefile.in | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index acb51351..c4a98f32 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-10-10 Tatsuhiro Tsujikawa + + Don't set localedir manually. Leave it to autoconf. + * configure.ac + * src/Makefile.am + 2009-10-10 Tatsuhiro Tsujikawa Added --install to ACLOCAL_AMFLAGS. diff --git a/configure b/configure index 580cc8a3..60c47840 100755 --- a/configure +++ b/configure @@ -3578,10 +3578,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -# Set localedir -localedir=${datadir}/locale - - # Checks for arguments. # Check whether --with-gnutls was given. diff --git a/configure.ac b/configure.ac index 5b65b714..6c93ef8e 100644 --- a/configure.ac +++ b/configure.ac @@ -20,10 +20,6 @@ esac AC_DEFINE_UNQUOTED([TARGET], ["$target"], [Define target-type]) -# Set localedir -localedir=${datadir}/locale -AC_SUBST(localedir) - # Checks for arguments. ARIA2_ARG_WITH([gnutls]) ARIA2_ARG_WITH([openssl]) diff --git a/src/Makefile.am b/src/Makefile.am index d51233a6..56498f3e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -510,4 +510,4 @@ AM_CPPFLAGS = -Wall\ @LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\ @LIBZ_CPPFLAGS@ @SQLITE3_CFLAGS@\ - -DLOCALEDIR=\"$(localedir)\" -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg + -DLOCALEDIR=@localedir@ -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg diff --git a/src/Makefile.in b/src/Makefile.in index 9d0bd3b6..463bd5f8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1160,7 +1160,7 @@ AM_CPPFLAGS = -Wall\ @LIBGNUTLS_CFLAGS@ @LIBGCRYPT_CFLAGS@ @OPENSSL_CFLAGS@ @XML_CPPFLAGS@\ @LIBCARES_CPPFLAGS@ @LIBEXPAT_CPPFLAGS@\ @LIBZ_CPPFLAGS@ @SQLITE3_CFLAGS@\ - -DLOCALEDIR=\"$(localedir)\" -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg + -DLOCALEDIR=@localedir@ -DCA_BUNDLE=\"$(ca_bundle)\" @DEFS@ #-pg all: all-am