diff options
| author | James O'Gorman <james@netinertia.co.uk> | 2010-04-11 16:18:00 +0000 |
|---|---|---|
| committer | James O'Gorman <james@netinertia.co.uk> | 2010-04-11 16:18:00 +0000 |
| commit | b250f95f3d6b3ef20c57aa2b89f2f3d8599fe36c (patch) | |
| tree | 8113b59bc93dc61bdccab483ecfab70338523e11 | |
| parent | 8edbcdfa70b41fb3ad5beedd5108f635de5f9c10 (diff) | |
Play nicely with versions of make which don't support -C <dir>.
| -rwxr-xr-x | infrastructure/makeparcels.pl.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/infrastructure/makeparcels.pl.in b/infrastructure/makeparcels.pl.in index 4cdd2fea..48a545dd 100755 --- a/infrastructure/makeparcels.pl.in +++ b/infrastructure/makeparcels.pl.in @@ -123,7 +123,7 @@ release/common/test: .PHONY: docs docs: - \$(MAKE) -C docs + cd docs; \$(MAKE) __END_OF_FRAGMENT @@ -219,7 +219,7 @@ EOF print MAKE <<EOF; .PHONY: docs/man/${name}.gz docs/man/${name}.gz: - \$(MAKE) -C docs man/${name}.gz + cd docs; \$(MAKE) man/${name}.gz EOF push @parcel_deps, "$dir/${name}.gz"; @@ -237,7 +237,7 @@ EOF print MAKE <<EOF; .PHONY: docs/htmlguide/man-html/${name}.html docs/htmlguide/man-html/${name}.html: - \$(MAKE) -C docs htmlguide/man-html/${name}.html + cd docs; \$(MAKE) htmlguide/man-html/${name}.html EOF push @parcel_deps, "$dir/docs/${name}.html"; @@ -245,14 +245,15 @@ EOF elsif ($type eq 'subdir') { shift @args; + my $subdir = shift @args; print MAKE <<EOF; .PHONY: $name-build $name-clean $name-build: - \$(MAKE) -C @args + cd $subdir; \$(MAKE) @args $name-clean: - \$(MAKE) -C $name clean + cd $name; \$(MAKE) clean EOF push @parcel_deps, "$name-build"; push @clean_deps, "$name-clean"; @@ -354,7 +355,7 @@ install: cat local/install.msg clean: @clean_deps - \$(MAKE) -C docs clean + cd docs; \$(MAKE) clean EOF if ($build_os eq 'CYGWIN') |