From: Allan Randall <allanr@sgi.com>
Date: Tue, 2 Jan 2007 14:38:56 +0000 (+0000)
Subject: Dmapi build fix
X-Git-Tag: v1.1.0~536
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0015c93d02db86f5e89ed4ab313e8c05368955d;p=xfstests-dev.git

Dmapi build fix
Merge of master-melb:xfs-cmds:27826a by kenmcd.

  added default make option
---

diff --git a/dmapi/Makefile.in b/dmapi/Makefile.in
index ad6a4e8d..338c8f5b 100644
--- a/dmapi/Makefile.in
+++ b/dmapi/Makefile.in
@@ -168,6 +168,7 @@ target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src
 all: all-recursive
+default: all-recursive
 
 .SUFFIXES:
 am--refresh:
diff --git a/include/buildmacros b/include/buildmacros
index 44826455..b2559efc 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -124,14 +124,7 @@ endif
 
 SUBDIRS_MAKERULE = \
 	@for d in $(SUBDIRS) ""; do \
-		if test "$$d" == "dmapi"; then \
-        		if test "$(PKG_PLATFORM)" == "irix" ; then \
-				echo "DMAPI QA NOT AVAIABLE FOR IRIX"; \
-			else \
-		                $(ECHO) === $$d ===; \
-               	        	cd dmapi && $(MAKE) $@ && cd .. || exit $$?; \
-			fi; \
-		elif test -d "$$d" -a ! -z "$$d"; then \
+		if test -d "$$d" -a ! -z "$$d"; then \
 			$(ECHO) === $$d ===; \
 			$(MAKEF) -C $$d $@ || exit $$?; \
 		fi; \