From: Eric Sandeen <sandeen@sandeen.net>
Date: Thu, 3 Dec 2009 16:30:11 +0000 (-0600)
Subject: commit bd53c922 added src/aio-dio-regress to the top-level
X-Git-Tag: v1.1.0~236
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fed5346d92d245951c0b2f01f75af370cc3b57d3;p=xfstests-dev.git

commit bd53c922 added src/aio-dio-regress to the top-level
Makefile so that it would get caught on make install, but
doing this unconditionally means that we tried to build that
subdir even if libaio headers weren't found.

Fix this up to do a properly chained make install through
the subdirs...

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/Makefile b/Makefile
index 4dcb7798..b017580d 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \
 	check.log check.time
 
 LIB_SUBDIRS = include lib
-TOOL_SUBDIRS = ltp src src/aio-dio-regress m4
+TOOL_SUBDIRS = ltp src m4
 
 SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
 
diff --git a/src/Makefile b/src/Makefile
index 7b01754a..9f196051 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -135,8 +135,11 @@ open_unlink: open_unlink.o $(LIBHANDLE)
 
 endif
 
-install:
+install: $(addsuffix -install,$(SUBDIRS))
 	$(INSTALL) -m 755 -d $(PKG_LIB_DIR)/src
 	$(INSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/src
 	$(INSTALL) -m 755 fill2attr fill2fs fill2fs_check scaleread.sh $(PKG_LIB_DIR)/src
 	$(INSTALL) -m 644 dumpfile $(PKG_LIB_DIR)/src
+
+%-install:
+	$(MAKE) -C $* install