From b371cf8438203fd09a32cc1a6963542e344a6f8e Mon Sep 17 00:00:00 2001 From: Ron Date: Thu, 18 Oct 2012 14:05:55 +1030 Subject: 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 --- Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile.am') 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 -- cgit v1.2.3