Преглед изворни кода

2009-10-10 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Don't set localedir manually. Leave it to autoconf.
	* configure.ac
	* src/Makefile.am
Tatsuhiro Tsujikawa пре 16 година
родитељ
комит
cb69cca675
5 измењених фајлова са 8 додато и 10 уклоњено
  1. 6 0
      ChangeLog
  2. 0 4
      configure
  3. 0 4
      configure.ac
  4. 1 1
      src/Makefile.am
  5. 1 1
      src/Makefile.in

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2009-10-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Don't set localedir manually. Leave it to autoconf.
+	* configure.ac
+	* src/Makefile.am
+
 2009-10-10  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Added --install to ACLOCAL_AMFLAGS.

+ 0 - 4
configure

@@ -3578,10 +3578,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-# Set localedir
-localedir=${datadir}/locale
-
-
 # Checks for arguments.
 
 # Check whether --with-gnutls was given.

+ 0 - 4
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])

+ 1 - 1
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

+ 1 - 1
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