From 15b13aea06f945dddb50713b39f5899435737a0f Mon Sep 17 00:00:00 2001 From: Allan Randall Date: Wed, 20 Dec 2006 02:51:57 +0000 Subject: [PATCH] fixed Makefile for building dmapi tests Merge of master-melb:xfs-cmds:27778a by kenmcd. fixed Makefile for building dmapi tests --- Makefile | 2 +- include/buildmacros | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5e1ff189..63603d4e 100644 --- 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 c6678e57..44826455 100644 --- 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 ===; \ -- 2.47.3