diff options
| author | Ron <ron@debian.org> | 2012-10-18 07:35:55 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-10-20 01:46:03 +0400 |
| commit | b371cf8438203fd09a32cc1a6963542e344a6f8e (patch) | |
| tree | 654c1eb40dcc97abf3c57ad7a2b55f2cbfe3b947 /Makefile.am | |
| parent | 3aa264732ce0e5200e5d931e88221d22270f2b00 (diff) | |
cd doc && make is not the same as make -C doc
Fixes a regression in the recursive builds introduced in 5467ce7b3f8
that causes `make check-opus` to fail horribly.
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 07876626..bab9f6d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,24 +127,24 @@ install-opus: install # Or just the docs docs: - cd doc && $(MAKE) $(AM_MAKEFLAGS) + ( cd doc && $(MAKE) $(AM_MAKEFLAGS) ) install-docs: - cd doc && $(MAKE) $(AM_MAKEFLAGS) install + ( cd doc && $(MAKE) $(AM_MAKEFLAGS) install ) # Or everything (by default) all-local: - @[ -n "$(NO_DOXYGEN)" ] || cd doc && $(MAKE) $(AM_MAKEFLAGS) + @[ -n "$(NO_DOXYGEN)" ] || ( cd doc && $(MAKE) $(AM_MAKEFLAGS) ) install-data-local: - @[ -n "$(NO_DOXYGEN)" ] || cd doc && $(MAKE) $(AM_MAKEFLAGS) install + @[ -n "$(NO_DOXYGEN)" ] || ( cd doc && $(MAKE) $(AM_MAKEFLAGS) install ) clean-local: - -cd doc && $(MAKE) $(AM_MAKEFLAGS) clean + -( cd doc && $(MAKE) $(AM_MAKEFLAGS) clean ) uninstall-local: - cd doc && $(MAKE) $(AM_MAKEFLAGS) uninstall + ( cd doc && $(MAKE) $(AM_MAKEFLAGS) uninstall ) .PHONY: opus check-opus install-opus docs install-docs |