From 17d0fefeb1c28860be94ff97178c6a80468c7e2c Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Mon, 1 Dec 2003 19:32:56 +0000
Subject: [PATCH] Add nreleae back in.  It's a dummy target designed only to
 ensure that the proper obj dir infrastructure is created so the nrelease
 Makefile's can use ${.OBJDIR}.

Adjust the nrelease Makefile's to perform port checks only when actually
building the release.
---
 Makefile.inc1     |  9 ++++++++-
 nrelease/Makefile | 21 +++++++++++----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/Makefile.inc1 b/Makefile.inc1
index be14197c0c..13df76f19b 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.10 2003/12/01 17:07:26 drhodus Exp $
+# $DragonFly: src/Makefile.inc1,v 1.11 2003/12/01 19:32:53 dillon Exp $
 #
 # Make command line options:
 #	-DMAKE_KERBEROS5 to build Kerberos5
@@ -52,6 +52,13 @@ SUBDIR+= include
 .if exists(${.CURDIR}/lib)
 SUBDIR+= lib
 .endif
+# This exists simply to ensure that the obj dir hierarchy is
+# intact for nrelease, allowing the nrelease Makefile's to 
+# reference ${.OBJDIR}.
+#
+.if exists(${.CURDIR}/nrelease)
+SUBDIR+= nrelease
+.endif
 
 .if exists(${.CURDIR}/bin)
 SUBDIR+= bin
diff --git a/nrelease/Makefile b/nrelease/Makefile
index 6114eba778..ddf7946de1 100644
--- a/nrelease/Makefile
+++ b/nrelease/Makefile
@@ -1,4 +1,4 @@
-# $DragonFly: src/nrelease/Makefile,v 1.3 2003/12/01 19:12:25 dillon Exp $
+# $DragonFly: src/nrelease/Makefile,v 1.4 2003/12/01 19:32:56 dillon Exp $
 #
 ISODIR ?= /usr/release
 ISOFILE ?= ${ISODIR}/dfly.iso
@@ -6,18 +6,19 @@ ISOROOT = ${ISODIR}/root
 OBJSYS= ${.OBJDIR}/../sys
 KERNCONF ?= GENERIC
 
-#.if !exists(/usr/local/bin/mkisofs)
-#.error "You need to install the mkisofs port so I can build the ISO"
-#.endif
-#.if !exists(/usr/local/bin/cvsup)
-#.error "You need to install the cvsup port so I can put cvsup in the ISO"
-#.endif
+release:	check clean buildworld1 buildkernel1 buildiso mkiso
 
-release:	clean buildworld1 buildkernel1 buildiso mkiso
+quickrel:	check clean buildworld2 buildkernel2 buildiso mkiso
 
-quickrel:	clean buildworld2 buildkernel2 buildiso mkiso
+realquickrel:	check clean buildiso mkiso
 
-realquickrel:	clean buildiso mkiso
+check:
+	if [ ! -f /usr/local/bin/mkisofs ]; then \
+		echo "You need to install the mkisofs port for this target"; \
+		exit 1; fi
+	if [ ! -f /usr/local/bin/cvsup ]; then \
+		echo "You need to install the cvsup port for this target"; \
+		exit 1; fi
 
 buildworld1:
 	( cd ${.CURDIR}/..; make buildworld )
-- 
2.41.0