2006-06-22 [paul] 2.3.1cvs14

	* configure.ac
		allow setting of man directory location

diff --git a/ChangeLog b/ChangeLog
index 58c2dbd170e6f1367e06b4f754f60a8e79361520..de2eb99de6f0e3b81eb2cf16e29c71e12e9c845e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-22 [paul]      2.3.1cvs14
+
+       * configure.ac
+               allow setting of man directory location
+

 2006-06-22 [colin]     2.3.1cvs13
 
        * src/mainwindow.c
 2006-06-22 [colin]     2.3.1cvs13
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index b5b9a581654e85d8383b22916cc97d782ff3c5f8..a6eba46cc27c63638dd3ebed129ee44f3aee74fa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -1614,3 +1614,4 @@
 ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 manual/advanced.xml;  ) > 2.3.1cvs11.patchset
 ( cvs diff -u -r 1.36.2.66 -r 1.36.2.67 src/common/utils.c;  ) > 2.3.1cvs12.patchset
 ( cvs diff -u -r 1.274.2.118 -r 1.274.2.119 src/mainwindow.c;  ) > 2.3.1cvs13.patchset
 ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 manual/advanced.xml;  ) > 2.3.1cvs11.patchset
 ( cvs diff -u -r 1.36.2.66 -r 1.36.2.67 src/common/utils.c;  ) > 2.3.1cvs12.patchset
 ( cvs diff -u -r 1.274.2.118 -r 1.274.2.119 src/mainwindow.c;  ) > 2.3.1cvs13.patchset

+( cvs diff -u -r 1.654.2.1660 -r 1.654.2.1661 configure.ac;  ) > 2.3.1cvs14.patchset

diff --git a/configure.ac b/configure.ac
index 740ca8fcda629e4bcc99e0699ab5ef3fd5055dfa..f290fae76e2255d0d6d856ab65fa70712ed53ca8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=13
+EXTRA_VERSION=14

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 


@@ -176,6 +176,12 @@ if test "x${DATADIRNAME}" = "x"; then
   AC_SUBST(DATADIRNAME)
 fi
 
   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],
 localedir='${prefix}/${DATADIRNAME}/locale'
 AC_ARG_WITH(localedir,
        [  --with-localedir=DIR    Locale directory],