2006-06-20 [paul] 2.3.1cvs1

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2a812dbe73fc99674a6a19f928c6358471d0f30c..a656992f4fb013c7570be163da71ea21c64aaee7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,11 +7,11 @@ PACKAGE=sylpheed-claws
 
 dnl version number
 MAJOR_VERSION=2
-MINOR_VERSION=2
-MICRO_VERSION=0
+MINOR_VERSION=3
+MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=57
+EXTRA_VERSION=1
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -195,14 +195,10 @@ AC_ARG_ENABLE(manual,
 AM_CONDITIONAL(BUILD_MANUAL, test x"$ac_cv_enable_manual" = xyes)
 
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", PACKAGE_DATA_DIR)
-  fi
+if test "x${prefix}" = "xNONE"; then
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}", PACKAGE_DATA_DIR)
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", PACKAGE_DATA_DIR)
+    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/${DATADIRNAME}/${PACKAGE}", PACKAGE_DATA_DIR)
 fi
 
 AC_CHECK_LIB(xpg4, setlocale)