diff options
| author | Raimo Niskanen <[email protected]> | 2012-02-06 15:17:33 +0100 |
|---|---|---|
| committer | Raimo Niskanen <[email protected]> | 2012-02-06 15:17:33 +0100 |
| commit | c0372d192ffc4873712dc724d6de6520c410e8f1 (patch) | |
| tree | 902561a3f4044ca3c83fa31dead95d61eaaff822 /erts/Makefile.in | |
| parent | 2d97f0e5f13bf22d92dbc6df18787581eb462c41 (diff) | |
| parent | c844fab31d7199d3f5feb017beab4df229e8153f (diff) | |
| download | otp-c0372d192ffc4873712dc724d6de6520c410e8f1.tar.gz otp-c0372d192ffc4873712dc724d6de6520c410e8f1.tar.bz2 otp-c0372d192ffc4873712dc724d6de6520c410e8f1.zip | |
Merge branch 'raimo/parallel-make/OTP-9857' into maint
* raimo/parallel-make/OTP-9857:
Work around windows .pdb parallel make collision
erts: Fix recently broken documentation build
Diffstat (limited to 'erts/Makefile.in')
| -rw-r--r-- | erts/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/Makefile.in b/erts/Makefile.in index 2b4f562c06..1979c50781 100644 --- a/erts/Makefile.in +++ b/erts/Makefile.in @@ -156,4 +156,4 @@ release: .PHONY: release_docs release_docs: - ( cd emulator && $(MAKE) $@ ) + ( cd doc/src && $(MAKE) $@ ) |