commit f071d9e03fd91b3e838fec677a3fd356074343eb
Author: František Dvořák <valtri@civ.zcu.cz>
Date:   Thu Aug 22 10:25:32 2013 +0200

    Update RPM packaging of documentation (Fedora review #885703).

diff --git a/org.glite.lb/configure b/org.glite.lb/configure
index 5f9fc40..02b98bb 100755
--- a/org.glite.lb/configure
+++ b/org.glite.lb/configure
@@ -57,6 +57,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/;
@@ -263,6 +264,7 @@ my @opts = (
 	'url-rpm=s' => \$url_rpm,
 	'url-deb=s' => \$url_deb,
 	'url-source=s' => \$url_source,
+	'docdir=s' => \$docdir,
 );
 
 for (@nodes) {
@@ -1191,6 +1193,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";
 
@@ -1209,6 +1225,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};
@@ -1276,21 +1301,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_ = $_;
@@ -1533,6 +1545,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
diff --git a/org.glite.lbjp-common.log/Makefile b/org.glite.lbjp-common.log/Makefile
index 2a865da..20f390a 100644
--- a/org.glite.lbjp-common.log/Makefile
+++ b/org.glite.lbjp-common.log/Makefile
@@ -18,6 +18,7 @@ default: all
 -include ${top_srcdir}/project/version.properties
 
 version=${module.version}
+docdir?=${prefix}/share/doc/${package}-${version}
 
 CC=gcc
 VPATH=${top_srcdir}/interface:${top_srcdir}/src:${top_srcdir}/tests
@@ -74,12 +75,12 @@ stage: compile
 install: compile
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} 
 	${INSTALL} -m 644 ${top_srcdir}/src/log.h ${DESTDIR}${PREFIX}${prefix}/include/${globalprefix}/${lbutilsprefix} 
-	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
-	${INSTALL} -m 644 ${top_srcdir}/README ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}
+	mkdir -p ${DESTDIR}${PREFIX}${docdir}
+	${INSTALL} -m 644 ${top_srcdir}/README ${DESTDIR}${PREFIX}${docdir}
 	mkdir -p ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb
 	${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${DESTDIR}${PREFIX}${sysconfdir}/glite-lb/log4crc
-	${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/log4crc.example-production
-	${INSTALL} -m 644 ${top_srcdir}/config/log4crc.debugging ${DESTDIR}${PREFIX}${prefix}/share/doc/${package}-${version}/log4crc.example-debugging
+	${INSTALL} -m 644 ${top_srcdir}/config/log4crc ${DESTDIR}${PREFIX}${docdir}/log4crc.example-production
+	${INSTALL} -m 644 ${top_srcdir}/config/log4crc.debugging ${DESTDIR}${PREFIX}${docdir}/log4crc.example-debugging
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/${libdir}
 	${INSTALL} -m 755 ${LTLIB} ${DESTDIR}${PREFIX}${prefix}/${libdir}/${LTLIB}