Changeable module documentation directory.

diff --git a/org.glite.lb.client/Makefile b/org.glite.lb.client/Makefile
index eb09545..cd55a00 100644
--- a/org.glite.lb.client/Makefile
+++ b/org.glite.lb.client/Makefile
@@ -14,6 +14,7 @@ default: all
 -include ${top_srcdir}/project/version.properties
 
 version=${module.version}
+docdir?=${prefix}/share/doc/${package}-${version}
 
 # We must follow major version changes of org.glite.lb.common due to
 # binary compatibility. However, we may live a life of our own, changing our
@@ -363,7 +364,7 @@ install:
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/sbin
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig
-	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/
+	mkdir -p ${DESTDIR}${PREFIX}${docdir}/examples/
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/man/man1
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples
 	mkdir -p ${DESTDIR}${m4dir}
@@ -377,12 +378,12 @@ else
 endif
 	${INSTALL} -m 644 client.pc ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig/glite-lb-client.pc
 	${INSTALL} -m 644 clientpp.pc ${DESTDIR}${PREFIX}${prefix}/${libdir}/pkgconfig/glite-lb-clientpp.pc
-	${INSTALL} -m 644 ${top_srcdir}/doc/README-notify ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+	${INSTALL} -m 644 ${top_srcdir}/doc/README-notify ${DESTDIR}${PREFIX}${docdir}
 	(cd ${top_srcdir}/interface && ${INSTALL} -m 644 ${HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix}) 
 	${INSTALL} -m 644 ${GEN_HDRS} ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbprefix} 
 ifndef LB_STANDALONE
-#	cp -r C CPP ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-#       cp -r ${top_srcdir}/doc/api/{Makefile,api.tex,fig} ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/api
+#	cp -r C CPP ${DESTDIR}${PREFIX}${docdir}
+#       cp -r ${top_srcdir}/doc/api/{Makefile,api.tex,fig} ${DESTDIR}${PREFIX}${docdir}/api
 endif
 	for p in logevent notify register_sandbox; do \
 		${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/bin/glite-lb-$$p"; \
@@ -394,10 +395,10 @@ endif
 		${INSTALL} -m 755 "$$p" "${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-$$p"; \
 	done
 	for p in ${EXAMPLES_SRC} ${EXAMPLES_PLUS_SRC} ${EXAMPLES_CL_SRC} ${EXAMPLES_CL_THR_SRC} ; do \
-		${INSTALL} -m 644 "${top_srcdir}/examples/$$p" "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/"; \
+		${INSTALL} -m 644 "${top_srcdir}/examples/$$p" "${DESTDIR}${PREFIX}${docdir}/examples/"; \
 	done
-	${INSTALL} -m 644 ${top_srcdir}/examples/Makefile "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/"
-	${INSTALL} -m 644 ${top_srcdir}/examples/README.examples "${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/examples/"
+	${INSTALL} -m 644 ${top_srcdir}/examples/Makefile "${DESTDIR}${PREFIX}${docdir}/examples/"
+	${INSTALL} -m 644 ${top_srcdir}/examples/README.examples "${DESTDIR}${PREFIX}${docdir}/examples/"
 	${INSTALL} -m 755 ${top_srcdir}/examples/notify.pl ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-notify.pl
 	${INSTALL} -m 755 ${top_srcdir}/examples/sandbox_transfers.sh ${DESTDIR}${PREFIX}${prefix}/${libdir}/glite-lb/examples/glite-lb-sandbox_transfers.sh
 	${INSTALL} -m 644 ${MAN_GZ} ${DESTDIR}${PREFIX}${prefix}/share/man/man1
diff --git a/org.glite.lb.client/configure b/org.glite.lb.client/configure
index ebaa0a1..6e5834d 100755
--- a/org.glite.lb.client/configure
+++ b/org.glite.lb.client/configure
@@ -60,6 +60,7 @@ my $url = $default_url;
 my $url_rpm;
 my $url_deb;
 my $url_source;
+my $docdir;
 my $pkg_config_env = (defined $ENV{PKG_CONFIG_PATH}) ? "$ENV{PKG_CONFIG_PATH}:" : '';
 
 my @nodes = qw/client server logger logger-msg nagios utils client-java doc ws-test db jpprimary jpindex jpclient harvester lb px proxyrenewal canl/;
@@ -269,6 +270,7 @@ my @opts = (
 	'url-rpm=s' => \$url_rpm,
 	'url-deb=s' => \$url_deb,
 	'url-source=s' => \$url_source,
+	'docdir=s' => \$docdir,
 );
 
 for (@nodes) {
@@ -1389,6 +1391,20 @@ canl.c
 		symlink "$top_srcdir/Makefile",$build."Makefile" or die "symlink $top_srcdir/Makefile ".$build."Makefile: $!\n";
 	}
 
+	# package name
+	my $dh;
+	opendir $dh, "$abs_srcdir/project" || die "Can't open $abs_srcdir/project: $!";
+	for my $dir (readdir $dh) {
+		if ($dir=~/^(.*)\.spec$/) {
+			if ($1 ne $packageName) {
+				printf STDERR "Changed RPM name: $packageName --> $1\n" if ($debug);;
+				$packageName=$1;
+			}
+			last;
+		}
+	}
+	closedir $dh;
+
 	open MKINC,">".$build."Makefile.inc"
 		or die $build."Makefile.inc: $!\n";
 
@@ -1407,6 +1423,15 @@ nothrflavour = $nothrflavour
 libdir = $libdir
 top_srcdir = $top_srcdir
 };
+	if ($docdir) {
+		my $d = $docdir;
+		$d =~ s/\$\{prefix\}/$prefix/g;
+		$d =~ s/\$\{moduleName\}/$full/g;
+		$d =~ s/\$\{packageName\}/$packageName/g;
+		$d =~ s/\$\{version\}/$major.$minor.$rev/g;
+		$d =~ s/\$\{age\}/$age/g;
+		print MKINC "docdir = $d\n";
+	}
 
 	for (@{$need_externs{$short}}) {
 		next unless defined $externs{$_} and defined $externs{$_}{prefix};
@@ -1474,21 +1499,8 @@ deb: ${package}-${version}.tar.gz
 
 	close MKINC;
 
-	my $dh;
 	my $debian = 0;
 
-	opendir $dh, "$abs_srcdir/project" || die "Can't open $abs_srcdir/project: $!";
-	for my $dir (readdir $dh) {
-		if ($dir=~/^(.*)\.spec$/) {
-			if ($1 ne $packageName) {
-				printf STDERR "Changed RPM name: $packageName --> $1\n" if ($debug);;
-				$packageName=$1;
-			}
-			last;
-		}
-	}
-	closedir $dh;
-
 	for my $file ("$packageName.spec", "debian.rules", "debian.control", "debian.changelog", "debian.copyright") {
 		if (-f "$abs_srcdir/project/$file") {
 			my $old_ = $_;
@@ -2203,6 +2215,7 @@ General options (defaults in []):
   --sysroot=DIR			system root (custom relocation root -> sysroot) []
   --sysconfdir=DIR              system configuration directory [PREFIX/etc]
   --localstatedir=DIR           system local status directory [PREFIX/var]
+  --docdir			documentation directory []
   --os-type=DIST                system type (debian/redhat/fedora)
   --staged=module,module,...	what is already in PREFIX (specify without org.glite.)
   --thrflavour=flavour