2006-06-29 [colin] 2.3.1cvs36

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 684e41c342e08fed55c41fc48923b6320c99993b..5be70c2df61f1254f507d5a07ef89d22974214d1 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=3
+MINOR_VERSION=3
+MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=36
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -176,6 +176,12 @@ if test "x${DATADIRNAME}" = "x"; then
   AC_SUBST(DATADIRNAME)
 fi
 
+mandir='${prefix}/${DATADIRNAME}/man'
+AC_ARG_WITH(mandir,
+       [  --with-mandir=DIR    man directory],
+       [mandir="$withval"])
+AC_SUBST(mandir)
+
 localedir='${prefix}/${DATADIRNAME}/locale'
 AC_ARG_WITH(localedir,
        [  --with-localedir=DIR    Locale directory],
@@ -195,14 +201,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)