--- src/usr.sbin/installer/libinstaller/Makefile	2008/03/12 01:34:49	1.1
+++ src/usr.sbin/installer/libinstaller/Makefile	2008/03/25 22:55:38	1.2
@@ -2,14 +2,21 @@
 
 BSDINS_DIR=${.CURDIR}/../../../contrib/bsdinstaller-1.1.6
 BSDINS_SRC=${BSDINS_DIR}/src
-.PATH:	${BSDINS_SRC}/lib/libinstaller
 
-CFLAGS+=-I${BSDINS_SRC}/lib/libdfui -I.
+CONTRIBDIR=	${BSDINS_SRC}/lib/libinstaller
+.PATH:	${CONTRIBDIR}
+
+PATCHES=	functions.c.patch  
+
+CFLAGS+=	-I${BSDINS_SRC}/lib/libdfui -I${CONTRIBDIR} -I. -g
 
 LIB=    installer
 
-SRCS+= commands.c confed.c diskutil.c functions.c mount.c package.c survey.c uiutil.c \
-	aura.h dfui.h
+SRCS+=	commands.c confed.c diskutil.c functions.c mount.c package.c survey.c uiutil.c 
+SRCS+=	aura.h dfui.h
+SRCS+=	${PATCHES}
+
+INCS+=	commands.h confed.h diskutil.h functions.h package.h sysids.h uiutil.h
 
 # This madness is because the installer sources reference aura includes
 # as <aura/mem.h> rather than <libaura/mem.h>
@@ -21,6 +28,7 @@ dfui.h:
 	${LN} -sf ${BSDINS_SRC}/lib/libdfui dfui
 	/usr/bin/touch dfui.h
 
+CLEANFILES+=	aura.h dfui.h aura dfui
 INTERNALLIB=            true
 
 DPADD+= ${.CURDIR}/../libaura/libaura.a  ${.CURDIR}/../libdfui/libdfui.a