From 4ee05d32db078ca2cf721e19b926359ea660c138 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@ncsa.illinois.edu>
Date: Fri, 18 Nov 2011 11:20:25 -0600
Subject: [PATCH] Revert "Fix parallel make from top-level to work on more
 platforms"

This reverts commit a92592d08d25eecd76972d6968e75228a85ff803.
---
 Makefile | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c5f4bf67ce..c736ecdbcb 100644
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,23 @@ VERSION_FULL=$(REPO)-`cat VERSION`
 VERSION_MIN=$(REPO)-`cat VERSION`-minimal
 HAVE_MODULES=git submodule | grep -v cmake >/dev/null
 
-SUBDIRS = $(BUILD)
-$(SUBDIRS):: configured
-	$(MAKE) -C $@ $(MAKECMDGOALS)
+all: configured
+	( cd $(BUILD) && make )
 
-all install install-aux doc docclean clean: $(SUBDIRS)
+install: configured
+	( cd $(BUILD) && make install )
+
+install-aux: configured
+	( cd $(BUILD) && make install-aux )
+
+clean: configured docclean
+	( cd $(BUILD) && make clean )
+
+doc: configured
+	( cd $(BUILD) && make doc )
+
+docclean: configured
+	( cd $(BUILD) && make docclean )
 
 dist:
 	@rm -rf $(VERSION_FULL) $(VERSION_FULL).tgz