From 8c5325e126d2be0eb69e778063eff6759032458d Mon Sep 17 00:00:00 2001 From: Eric Sandeen Date: Fri, 2 Jan 2009 22:28:37 -0600 Subject: [PATCH] Create xfstests install target. Signed-off-by: Eric Sandeen Reviewed-by: Christoph Hellwig --- Makefile | 16 +++++++++++++++- include/builddefs.in | 4 ++++ ltp/Makefile | 5 +++++ src/Makefile | 6 ++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c025eef2..b017580d 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,21 @@ $(DMAPI_MAKEFILE): aclocal.m4:: aclocal --acdir=`pwd`/m4 --output=$@ -install install-dev install-lib: +install: default $(addsuffix -install,$(SUBDIRS)) + $(INSTALL) -m 755 -d $(PKG_LIB_DIR) + $(INSTALL) -m 755 check $(PKG_LIB_DIR) + $(INSTALL) -m 755 [0-9]?? $(PKG_LIB_DIR) + $(INSTALL) -m 755 run.* $(PKG_LIB_DIR) + $(INSTALL) -m 644 group $(PKG_LIB_DIR) + $(INSTALL) -m 644 randomize.awk $(PKG_LIB_DIR) + $(INSTALL) -m 644 [0-9]??.* $(PKG_LIB_DIR) + $(INSTALL) -m 644 common* $(PKG_LIB_DIR) + +# Nothing. +install-dev install-lib: + +%-install: + $(MAKE) -C $* install realclean distclean: clean rm -f $(LDIRT) $(CONFIGURE) diff --git a/include/builddefs.in b/include/builddefs.in index ae8c608e..d855c89e 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -27,6 +27,10 @@ PKG_RELEASE = @pkg_release@ PKG_VERSION = @pkg_version@ PKG_PLATFORM = @pkg_platform@ PKG_DISTRIBUTION= @pkg_distribution@ +PKG_SBIN_DIR = @sbindir@ +# A bit of a hack; by rights only state should probably go here +# But for now ... +PKG_LIB_DIR = /var/lib/@pkg_name@ CC = @cc@ AWK = @awk@ diff --git a/ltp/Makefile b/ltp/Makefile index 9c0ba1ef..bcdac847 100644 --- a/ltp/Makefile +++ b/ltp/Makefile @@ -49,3 +49,8 @@ ifeq ($(HAVE_AIO), true) aio-stress: aio-stress.c $(LINKTEST) $(LIBAIO) $(LDLIBS) endif + +install: + $(INSTALL) -m 755 -d $(PKG_LIB_DIR)/ltp + $(INSTALL) -m 755 $(TARGETS) $(PKG_LIB_DIR)/ltp + diff --git a/src/Makefile b/src/Makefile index 4a3113ab..ad4c2047 100644 --- a/src/Makefile +++ b/src/Makefile @@ -126,3 +126,9 @@ open_unlink: open_unlink.o $(LIBHANDLE) $(LINKTEST) $(LIBHANDLE) $(LDLIBS) endif + +install: + $(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 -- 2.47.3