aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-03-07 03:25:32 +0100
committerDuncaen <mail@duncano.de>2017-03-07 03:25:32 +0100
commit58f4a62701fbf506e57f0892d05a9c35aa9cfc8b (patch)
tree7340cfd0aeb91e817362ee087d9aa662395ae399
parentf08fb6d197729278d09d3474f4fb19e302012acf (diff)
downloadlobase-58f4a62701fbf506e57f0892d05a9c35aa9cfc8b.tar.gz
mk: fix regress targets
-rw-r--r--Makefile2
-rw-r--r--mk/bsd.regress.mk2
-rw-r--r--mk/bsd.subdir.mk2
-rw-r--r--regress/Makefile3
4 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index c87251c..91d24bf 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ insteall:
regression-tests:
@echo "Running regression tests..." \
- && export PATH=$$PWD/dest/bin/:$$PATH \
+ && export PATH=$$PWD/dest/bin:$$PWD/dest/sbin:$$PATH \
&& cd regress \
&& $(MAKE) -I$(TOPDIR) -I$(TOPDIR)/mk depend \
&& exec $(MAKE) -I$(TOPDIR) -I$(TOPDIR)/mk SHELL=/bin/oksh regress
diff --git a/mk/bsd.regress.mk b/mk/bsd.regress.mk
index 8a95e91..3a26d63 100644
--- a/mk/bsd.regress.mk
+++ b/mk/bsd.regress.mk
@@ -7,7 +7,7 @@ depend:
regress:
ifneq (,$(REGRESS_TARGETS))
- for t in $(REGRESS_TARGETS); do \
+ @for t in $(REGRESS_TARGETS); do \
$(MAKE) $$t; \
done
endif
diff --git a/mk/bsd.subdir.mk b/mk/bsd.subdir.mk
index 76f4021..d484731 100644
--- a/mk/bsd.subdir.mk
+++ b/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
SUBDIR_MFLAGS = -I$(TOPDIR) -I$(TOPDIR)/mk
-SUBDIR_TARGETS = all install clean cleandir includes depend obj tags manlint
+SUBDIR_TARGETS = all install clean cleandir includes depend regress obj tags manlint
SKIPDIR ?=
$(SUBDIR_TARGETS): _SUBDIRUSE
diff --git a/regress/Makefile b/regress/Makefile
index 0e97ac7..491a431 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -1,5 +1,2 @@
SUBDIR = bin sbin usr.bin usr.sbin
-SKIPDIR =
-depend:
-.PHONY: depend
include bsd.subdir.mk