diff options
Diffstat (limited to 'infrastructure/makeparcels.pl.in')
| -rwxr-xr-x | infrastructure/makeparcels.pl.in | 69 |
1 files changed, 69 insertions, 0 deletions
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in index 4dc94925..f468dc1f 100755 --- a/infrastructure/makeparcels.pl.in +++ b/infrastructure/makeparcels.pl.in @@ -123,7 +123,11 @@ release/common/test: .PHONY: docs docs: +<<<<<<< HEAD \$(MAKE) -C docs +======= + cd docs; \$(MAKE) +>>>>>>> 0.12 __END_OF_FRAGMENT @@ -137,6 +141,12 @@ for my $parcel (@parcels) my $dir = BoxPlatform::parcel_dir($parcel); my @parcel_deps; +<<<<<<< HEAD +======= + # Need to use BSD install on Solaris + my $install_bin = $build_os eq 'SunOS' ? '/usr/ucb/install' : 'install'; + +>>>>>>> 0.12 unless ($target_windows) { open SCRIPT,">parcels/scripts/install-$parcel" or die @@ -217,10 +227,18 @@ $dir/${name}.gz: docs/man/${name}.gz EOF # Releases have the docs pre-made, but users # may want to rebuild them for some reason. +<<<<<<< HEAD print MAKE <<EOF; .PHONY: docs/man/${name}.gz docs/man/${name}.gz: \$(MAKE) -C docs man/${name}.gz +======= + my $docbook_source = "docs/docbook/${name}"; + $docbook_source =~ s/\.[58]$/.xml/; + print MAKE <<EOF; +docs/man/${name}.gz: $docbook_source docs/docbook/bb-man.xsl + cd docs; \$(MAKE) man/${name}.gz +>>>>>>> 0.12 EOF push @parcel_deps, "$dir/${name}.gz"; @@ -235,24 +253,43 @@ $dir/docs/${name}.html: docs/htmlguide/man-html/${name}.html EOF # Releases have the docs pre-made, but users # may want to rebuild them for some reason. +<<<<<<< HEAD print MAKE <<EOF; .PHONY: docs/htmlguide/man-html/${name}.html docs/htmlguide/man-html/${name}.html: \$(MAKE) -C docs htmlguide/man-html/${name}.html +======= + my $docbook_source = "docs/docbook/${name}.xml"; + print MAKE <<EOF; +docs/htmlguide/man-html/${name}.html: $docbook_source docs/docbook/bb-nochunk-book.xsl + cd docs; \$(MAKE) htmlguide/man-html/${name}.html +>>>>>>> 0.12 EOF push @parcel_deps, "$dir/docs/${name}.html"; } elsif ($type eq 'subdir') { +<<<<<<< HEAD +======= + shift @args; + my $subdir = shift @args; +>>>>>>> 0.12 print MAKE <<EOF; .PHONY: $name-build $name-clean $name-build: +<<<<<<< HEAD \$(MAKE) -C $name $name-clean: \$(MAKE) -C $name clean +======= + cd $subdir; \$(MAKE) @args + +$name-clean: + cd $name; \$(MAKE) clean +>>>>>>> 0.12 EOF push @parcel_deps, "$name-build"; push @clean_deps, "$name-clean"; @@ -297,7 +334,11 @@ EOF if ($type eq 'html') { +<<<<<<< HEAD $dest = "share/doc/$version"; +======= + $dest = "share/doc/@PACKAGE_TARNAME@"; +>>>>>>> 0.12 $name = "docs/$name.html"; } @@ -308,7 +349,11 @@ EOF $name =~ s/$/\.gz/; } +<<<<<<< HEAD if ($install and not $target_windows) +======= + if ($install and not $target_windows and not $type eq "subdir") +>>>>>>> 0.12 { my $local_install_dir = $install_into_dir; if (defined $dest) @@ -325,7 +370,11 @@ EOF } print SCRIPT "mkdir -p " . "\${DESTDIR}$local_install_dir/\n"; +<<<<<<< HEAD print SCRIPT "install $name " . +======= + print SCRIPT "$install_bin $name " . +>>>>>>> 0.12 "\${DESTDIR}$local_install_dir\n"; } } @@ -359,22 +408,42 @@ install: cat local/install.msg clean: @clean_deps +<<<<<<< HEAD \$(MAKE) -C docs clean +======= + cd docs; \$(MAKE) clean +>>>>>>> 0.12 EOF if ($build_os eq 'CYGWIN') { +<<<<<<< HEAD print MAKE "\tfind release debug -type f | xargs -r rm -f\n"; } else { print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n"; +======= + print MAKE "\tfind release debug -type f | xargs -r rm\n"; + print MAKE "\tfind . -name 'autogen_*' -type f | xargs -r rm\n"; +} +else +{ + print MAKE "\tfind release debug -type f -exec rm -f {} \\;\n"; + print MAKE "\tfind . -name 'autogen_*' -type f -exec rm -f {} \\;\n"; +>>>>>>> 0.12 } for my $parcel (@parcels) { +<<<<<<< HEAD print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel), "\n"; print MAKE "\trm -f ", BoxPlatform::parcel_target($parcel), "\n"; +======= + # need to use -f to avoid error if they don't exist (already cleaned) + print MAKE "\trm -rf ", BoxPlatform::parcel_dir($parcel), "\n"; + print MAKE "\trm -f ", BoxPlatform::parcel_target($parcel), "\n"; +>>>>>>> 0.12 } close MAKE; |