Hook the man pages into the build/install system. Man pages are now included in the client and server parcels and installed to $prefix/man.

2 files changed, 45 insertions, 0 deletions

diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in
index ba22ad62..6a7ea99e 100755
--- a/infrastructure/makeparcels.pl.in
+++ b/infrastructure/makeparcels.pl.in
@@ -110,11 +110,19 @@ else
 {
 	print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n";
 }
+print MAKE "\trm -rf docs/*.[58] docs/bb-man.xsl docs/man\n" if $product_version =~ /trunk_[0-9]+/;
 
 print MAKE "\n";
 
 print MAKE "test:\trelease/common/test\n\nrelease/common/test:\n\t./runtest.pl ALL release\n\n";
 
+print MAKE <<EOF if $product_version =~ /trunk_[0-9]+/;
+.PHONY: docs/bb-man.xsl
+docs/bb-man.xsl:
+	(cd docs; \$(MAKE) bb-man.xsl; if [ ! -d man ]; then mkdir man; fi)
+
+EOF
+
 my $release_flag = BoxPlatform::make_flag('RELEASE');
 
 for my $parcel (@parcels)
@@ -193,6 +201,24 @@ EOF
 
 			push @parcel_deps, "$dir/$filename";
 		}
+		elsif($type eq 'man')
+		{
+			print MAKE <<EOF;
+$dir/${name}.gz: docs/man/${name}.gz
+	mkdir -p $dir
+	cp -p docs/man/${name}.gz $dir
+
+EOF
+			# Only build the docs if we're building from trunk.
+			# Releases have the docs pre-made.
+			print MAKE <<EOF if $product_version =~ /trunk_[0-9]+/;
+.PHONY: docs/man/${name}.gz
+docs/man/${name}.gz: docs/bb-man.xsl
+	(cd docs; \$(MAKE) $name)
+
+EOF
+			push @parcel_deps, "$dir/${name}.gz";
+		}
 	}
 
 	print MAKE <<EOF;
@@ -232,6 +258,13 @@ EOF
 			$name =~ s{.*/}{};
 		}
 
+		if ($type eq 'man')
+		{
+			$name =~ /([0-9])$/;
+			$dest = "man/man$1";
+			$name =~ s/$/\.gz/;
+		}
+
 		if ($install and not $target_windows)
 		{
 			my $local_install_dir = $install_into_dir;
diff --git a/parcels.txt b/parcels.txt
index 9f91e33b..0685ba2a 100644
--- a/parcels.txt
+++ b/parcels.txt
@@ -9,6 +9,11 @@ backup-client
 	bin bbackupctl
 	script bin/bbackupd/bbackupd-config
 	noinstall script LICENSE.txt
+	man bbackupd.8
+	man bbackupquery.8
+	man bbackupctl.8
+	man bbackupd-config.8
+	man bbackupd.conf.5
 
 ONLY:mingw32,mingw32msvc
 	script bin/bbackupd/win32/installer.iss 
@@ -37,6 +42,13 @@ backup-server
 	script bin/bbstored/bbstored-config
 	script lib/raidfile/raidfile-config
 	noinstall script LICENSE.txt
+	man bbstored.8
+	man bbstoreaccounts.8
+	man bbstored-certs.8
+	man bbstored-config.8
+	man raidfile-config.8
+	man bbstored.conf.5
+	man raidfile.conf.5
 
 ONLY:SunOS
 	script contrib/solaris/bbstored-manifest.xml lib/svc/manifest