From: Eric Sandeen <sandeen@sandeen.net>
To: xfs-oss <xfs@oss.sgi.com>
Subject: [PATCH] xfstests: fix up aio-dio install & build
Date: Wed, 02 Dec 2009 13:35:29 -0600 [thread overview]
Message-ID: <4B16C181.4070601@sandeen.net> (raw)
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>
---
diff --git a/Makefile b/Makefile
index 4dcb779..b017580 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 7b01754..9f19605 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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2009-12-02 19:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-02 19:35 Eric Sandeen [this message]
2009-12-03 14:02 ` [PATCH] xfstests: fix up aio-dio install & build Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B16C181.4070601@sandeen.net \
--to=sandeen@sandeen.net \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox