diff mbox series

[1/2] Makefile: fix bug when running make install under tests/* directory

Message ID 1624332489-27616-1-git-send-email-xuyang2018.jy@fujitsu.com (mailing list archive)
State New, archived
Headers show
Series [1/2] Makefile: fix bug when running make install under tests/* directory | expand

Commit Message

Yang Xu (Fujitsu) June 22, 2021, 3:28 a.m. UTC 
The TESTS_DIR value is defined in TOPDIR makefile, it is empty here.
So running make install on ext4 directory will get the following info:

../../install-sh -o root -g root -m 755 -d /var/lib/xfstests//ext4

We can see they aren't installed under /var/lib/xfstests/tests/ext4 directory.
Fix this by moving TESTS_DIR definition to include/builddefs.in file.

Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
 Makefile             | 3 ++-
 include/builddefs.in | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/Makefile b/Makefile
index 86a2d399..f6f91a4d 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,8 @@  HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs && echo yes || echo
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(TOPDIR)/include/builddefs
+else
+export TESTS_DIR = tests
 endif
 
 SRCTAR = $(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -40,7 +42,6 @@  endif
 LIB_SUBDIRS = include lib
 TOOL_SUBDIRS = ltp src m4 common
 
-export TESTS_DIR = tests
 SUBDIRS = $(LIB_SUBDIRS) $(TOOL_SUBDIRS) $(TESTS_DIR)
 
 default: include/builddefs
diff --git a/include/builddefs.in b/include/builddefs.in
index f762a433..6641209f 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -35,7 +35,7 @@  PKG_VERSION     = @pkg_version@
 PKG_PLATFORM    = @pkg_platform@
 PKG_DISTRIBUTION= @pkg_distribution@
 PKG_LIB_DIR     = $(DESTDIR)@exec_prefix@/@pkg_name@
-
+TESTS_DIR	= tests
 
 CC              = @cc@
 AWK             = @awk@