--- src/nrelease/Makefile	2008/03/09 21:09:25	1.78
+++ src/nrelease/Makefile	2008/03/25 22:55:38	1.79
@@ -14,6 +14,7 @@ installer_fetch: warning fetch
 
 .if make(installer_release) || make(installer_quickrel) || make(installer_realquickrel) || make(installer_fetch)
 WITH_INSTALLER=
+WITH_LOCAL_INSTALLER=
 .endif
 
 # New method e.g. 'make installer fetch'.  A series of enhancement
@@ -34,6 +35,7 @@ WITH_GUI=
 .endif
 .if make(installer)
 WITH_INSTALLER=
+WITH_LOCAL_INSTALLER=
 .endif
 
 #########################################################################
@@ -90,16 +92,18 @@ PKGSRC_PACKAGES+=	modular-xorg-apps \
 ROOTSKELS+=		${.CURDIR}/gui
 .endif
 
-.if defined(WITH_INSTALLER)
+.if defined(WITH_INSTALLER) || defined(WITH_LOCAL_INSTALLER)
+.if !defined(WITH_LOCAL_INSTALLER)
 # note: the old dfuibe_install and curses depend on the old gettext and
 # must be removed for the old gettext to be removed.  The new dfuibe install
 # and curses are named the same as the old.
 #
 OLD_PKGSRC_PACKAGES+=	dfuibe_installer-1.1.6 gettext-lib-0.14.5 \
-			dfuibe_installer-1.1.7nb1 dfuife_curses-1.5
+#			dfuibe_installer-1.1.7nb1 dfuife_curses-1.5
 PKGSRC_PACKAGES+=	dfuibe_installer-1.1.7nb1.tgz dfuife_curses-1.5.tgz
 PKGSRC_PACKAGES+=	gettext-lib-0.14.6.tgz gettext-tools-0.14.6nb1.tgz
 PKGSRC_PACKAGES+=	libaura-3.1.tgz libdfui-4.2.tgz libinstaller-5.1.tgz
+.endif
 ROOTSKELS+=		${.CURDIR}/installer
 .endif
 
@@ -117,13 +121,13 @@ KERNEL_CCVER ?= ${CCVER}
 #				BASE ISO TARGETS 			#
 #########################################################################
 
-release:	check clean buildworld1 buildkernel1 \
+release:	localinstaller check clean buildworld1 buildkernel1 \
 		buildiso syssrcs customizeiso mklocatedb mkiso
 
-quickrel:	check clean buildworld2 buildkernel2 \
+quickrel:	localinstaller check clean buildworld2 buildkernel2 \
 		buildiso syssrcs customizeiso mklocatedb mkiso
 
-realquickrel:	check clean buildiso syssrcs customizeiso mklocatedb mkiso
+realquickrel:	localinstaller check clean buildiso syssrcs customizeiso mklocatedb mkiso
 
 quick:		quickrel
 
@@ -132,6 +136,10 @@ realquick:	realquickrel
 #########################################################################
 #			   CORE SUPPORT TARGETS 			#
 #########################################################################
+localinstaller:
+.if defined(WITH_LOCAL_INSTALLER)
+	cd ${.CURDIR}/../usr.sbin/installer; make  	
+.endif
 
 check:
 .if !exists(${PKGBIN_PKG_ADD})
@@ -186,6 +194,10 @@ buildiso:
 	if [ ! -d ${ISOROOT} ]; then mkdir -p ${ISOROOT}; fi
 	if [ ! -d ${NRLOBJDIR}/nrelease ]; then mkdir -p ${NRLOBJDIR}/nrelease; fi
 	( cd ${.CURDIR}/..; make DESTDIR=${ISOROOT} installworld )
+.if defined(WITH_LOCAL_INSTALLER)
+	( cd ${.CURDIR}/../usr.sbin/installer; make DESTDIR=${ISOROOT} install )
+	( cd ${.CURDIR}/../share/installer; make DESTDIR=${ISOROOT} install ) 	
+.endif
 	( cd ${.CURDIR}/../etc; MAKEOBJDIRPREFIX=${NRLOBJDIR}/nrelease \
 		make -m ${.CURDIR}/../share/mk DESTDIR=${ISOROOT} distribution )
 	chroot ${ISOROOT} /usr/bin/newaliases