From f89a03f157c8a7a94151d70dce5d49d28fd2437c Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Thu, 18 Oct 2007 18:16:21 +0000
Subject: enter iso dir for clean/cleandir, too, to delete dribbles

---
 distrib/alpha/Makefile   | 4 ++--
 distrib/amd64/Makefile   | 4 ++--
 distrib/hppa/Makefile    | 4 ++--
 distrib/i386/Makefile    | 4 ++--
 distrib/macppc/Makefile  | 4 ++--
 distrib/sgi/Makefile     | 8 ++++++--
 distrib/sparc/Makefile   | 4 ++--
 distrib/sparc64/Makefile | 4 ++--
 8 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/distrib/alpha/Makefile b/distrib/alpha/Makefile
index 6b2057fd404..a04c131c043 100644
--- a/distrib/alpha/Makefile
+++ b/distrib/alpha/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.7 2007/08/14 18:57:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2007/10/18 18:16:19 deraadt Exp $
 
 SUBDIR= bsd.rd floppy floppyB cdfs # floppyC
 
-.if	make(obj)
+.if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
 .endif
 
diff --git a/distrib/amd64/Makefile b/distrib/amd64/Makefile
index 233143a7019..a479f3cda56 100644
--- a/distrib/amd64/Makefile
+++ b/distrib/amd64/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.3 2007/08/14 18:57:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2007/10/18 18:16:20 deraadt Exp $
 
 SUBDIR= ramdisk_cd ramdiskA cdfs
 
-.if	make(obj)
+.if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
 .endif
 
diff --git a/distrib/hppa/Makefile b/distrib/hppa/Makefile
index 30f75fce699..19297da31ba 100644
--- a/distrib/hppa/Makefile
+++ b/distrib/hppa/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2007/08/14 18:57:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/10/18 18:16:20 deraadt Exp $
 
 SUBDIR=ramdisk
 
-.if	make(obj)
+.if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
 .endif
 
diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile
index 796d17b278e..d0cfb300888 100644
--- a/distrib/i386/Makefile
+++ b/distrib/i386/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.8 2007/08/14 18:57:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2007/10/18 18:16:20 deraadt Exp $
 
 SUBDIR= ramdisk_cd ramdiskA ramdiskB ramdiskC cdfs cdfs-emu
 
-.if	make(obj)
+.if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
 .endif
 
diff --git a/distrib/macppc/Makefile b/distrib/macppc/Makefile
index 2660bc13af6..007519e2225 100644
--- a/distrib/macppc/Makefile
+++ b/distrib/macppc/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.2 2007/08/14 18:57:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/10/18 18:16:20 deraadt Exp $
 
 SUBDIR= ramdisk
 
-.if	make(obj)
+.if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
 .endif
 
diff --git a/distrib/sgi/Makefile b/distrib/sgi/Makefile
index 0fe75ca9463..6d736081584 100644
--- a/distrib/sgi/Makefile
+++ b/distrib/sgi/Makefile
@@ -1,5 +1,9 @@
-#	$OpenBSD: Makefile,v 1.3 2007/10/13 21:22:27 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.4 2007/10/18 18:16:20 deraadt Exp $
 
-SUBDIR= ramdisk cdfs iso
+SUBDIR= ramdisk cdfs
+
+.if	make(obj) || make(cleandir) || make(clean)
+SUBDIR+= iso
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/distrib/sparc/Makefile b/distrib/sparc/Makefile
index d90a9bd754b..42ee020eaf0 100644
--- a/distrib/sparc/Makefile
+++ b/distrib/sparc/Makefile
@@ -1,8 +1,8 @@
-#	$OpenBSD: Makefile,v 1.7 2007/08/14 18:57:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2007/10/18 18:16:20 deraadt Exp $
 
 SUBDIR+= ../ramdisk ../miniroot cdfs
 
-.if	make(obj)
+.if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
 .endif
 
diff --git a/distrib/sparc64/Makefile b/distrib/sparc64/Makefile
index cc9f9ed67a1..8d2727824a1 100644
--- a/distrib/sparc64/Makefile
+++ b/distrib/sparc64/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.8 2007/08/14 18:57:32 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.9 2007/10/18 18:16:20 deraadt Exp $
 
 # preserve order: 'miniroot' depends on 'bsd.rd', 'cdfs' depends on 'miniroot'
 SUBDIR+= ramdisk ramdiskB bsd.rd miniroot cdfs
 
-.if	make(obj)
+.if	make(obj) || make(cleandir) || make(clean)
 SUBDIR+= iso
 .endif
 
-- 
cgit v1.2.3