Create xfstests install target.

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

diff --git a/Makefile b/Makefile
index c025eef2e8a9294db6851a7382224ed4181e6089..b017580d4935818d128d1d81b9171191e205e849 100644 (file)
--- 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 ae8c608e3b477025e59c89fdf47887c936572fbe..d855c89ec46ac47e95ec63bb7db1766ca9041139 100644 (file)
--- 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 9c0ba1efbcda20a0d4b548632ed09a350ccc61f4..bcdac847a843b1a7484dae21db57a6476f739f1a 100644 (file)
--- 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 4a3113ab326f4a9c2831d7d101d95c2c52fe8b03..ad4c2047f201cfae249823003c60a673159a62c7 100644 (file)
--- 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