Use #include <pccard_conf.h> instead of -DPCCARD.

Now we don't have to make clean before make boot.flp's.

1 files changed, 13 insertions, 7 deletions

diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile
index 7a5bdf3..20ce7ce 100644
--- a/usr.sbin/sysinstall/Makefile
+++ b/usr.sbin/sysinstall/Makefile
@@ -5,7 +5,7 @@ BINDIR=/stand
 NOSHARED=YES
 
 CLEANFILES+=	makedevs.c rtermcap rtermcap.tmp dumpnlist
-CLEANFILES+=	keymap.tmp keymap.h
+CLEANFILES+=	keymap.tmp keymap.h pccard_conf.h
 
 .PATH: ${.CURDIR}/../disklabel ${.CURDIR}/../../usr.bin/cksum
 
@@ -13,8 +13,8 @@ SRCS=	anonFTP.c cdrom.c command.c config.c devices.c kget.c \
 	disks.c dispatch.c dist.c dmenu.c doc.c dos.c floppy.c \
 	ftp.c globals.c index.c install.c installUpgrade.c keymap.c \
 	label.c lndir.c main.c makedevs.c media.c menus.c misc.c mouse.c \
-	msg.c network.c nfs.c options.c package.c pccard.c system.c \
-	tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
+	msg.c network.c nfs.c options.c package.c pccard_conf.h pccard.c \
+	system.c tape.c tcpip.c termcap.c ufs.c user.c variable.c wizard.c \
 	keymap.h
 
 CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
@@ -23,13 +23,19 @@ CFLAGS+= -DUC_PRIVATE -DKERN_NO_SYMBOLS
 
 PCCARD?= NO
 
-.if ${PCCARD} == "YES"
-CFLAGS+= -DPCCARD
-.endif
-
 DPADD=	${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
 LDADD=	-ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio
 
+cleanconfig:
+	rm -f pccard_conf.h
+	
+pccard_conf.h: cleanconfig
+.if ${PCCARD} == "YES"
+	echo "#define PCCARD 1" > pccard_conf.h
+.else
+	echo "#undef PCCARD" > pccard_conf.h
+.endif
+
 makedevs.c:	Makefile rtermcap keymap.h
 	rm -f makedevs.tmp
 	echo '#include <sys/types.h>' > makedevs.tmp