fixed Makefile for building dmapi tests

Merge of master-melb:xfs-cmds:27778a by kenmcd.

  fixed Makefile for building dmapi tests

diff --git a/Makefile b/Makefile
index 5e1ff189e18bd702c4de7773ffbf14c4e6df99cd..63603d4ebf49964bb4c7941e0309b4e783f0f7e1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 #
 
 TOPDIR = .
-HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs && echo yes || echo no)
+HAVE_BUILDDEFS = $(shell test -f $(TOPDIR)/include/builddefs -a -f $(TOPDIR)/dmapi/Makefile && echo yes || echo no)
 
 ifeq ($(HAVE_BUILDDEFS), yes)
 include $(TOPDIR)/include/builddefs

diff --git a/include/buildmacros b/include/buildmacros
index c6678e57268625e5cb8c0bfc66646cc076986729..448264557051c02bb7834a3a5d9c6ddd62032b60 100644 (file)
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -129,7 +129,7 @@ SUBDIRS_MAKERULE = \
                                echo "DMAPI QA NOT AVAIABLE FOR IRIX"; \
                        else \
                                $(ECHO) === $$d ===; \
-                                       cd dmapi && $(MAKE) && cd .. || exit $$?; \
+                                       cd dmapi && $(MAKE) $@ && cd .. || exit $$?; \
                        fi; \
                elif test -d "$$d" -a ! -z "$$d"; then \
                        $(ECHO) === $$d ===; \