Changeset 2475 for box/trunk/infrastructure

Timestamp:

28/03/2009 14:01:39 (3 years ago)

Author:

chris

Message:

Use the Makefile in docs/ to build and clean documentation.

Don't rely on location of bb-man.xsl any more.

File:

• box/trunk/infrastructure/makeparcels.pl.in (modified) (2 diffs)

box/trunk/infrastructure/makeparcels.pl.in

@@ -111 +111 @@
         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
+
+print MAKE <<__END_OF_FRAGMENT;
+        \$(MAKE) -C docs clean
+
+test:   release/common/test
+
+release/common/test:
+        ./runtest.pl ALL release
+
+.PHONY: docs
+docs:
+        \$(MAKE) -C docs
+
+__END_OF_FRAGMENT
 
 my $release_flag = BoxPlatform::make_flag('RELEASE');
@@ -210 +212 @@
 
 EOF
-                        # Only build the docs if we're building from trunk.
-                        # Releases have the docs pre-made.
+                        # Releases have the docs pre-made, but users
+                        # may want to rebuild them for some reason.
                         print MAKE <<EOF;
 .PHONY: docs/man/${name}.gz
-docs/man/${name}.gz: docs/bb-man.xsl
-        (cd docs; \$(MAKE) $name)
+docs/man/${name}.gz:
+        \$(MAKE) -C docs man/${name}.gz
 
 EOF