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

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

4 files changed, 18 insertions, 10 deletions

diff --git a/release/Makefile b/release/Makefile
index bb255b3..0b67b34 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -333,7 +333,7 @@ release.4:
 .else
 	cp ${.CURDIR}/boot_crunch.conf.generic ${.OBJDIR}/boot_crunch.conf
 .endif
-	cd ${.CURDIR}/sysinstall && make clean obj depend all install
+	cd ${.CURDIR}/sysinstall && make obj depend all install
 	rm -rf ${RD}/crunch
 	mkdir -p ${RD}/crunch
 	export RELEASE_BUILD_FIXIT=noway ; \
diff --git a/release/sysinstall/Makefile b/release/sysinstall/Makefile
index 7a5bdf3..20ce7ce 100644
--- a/release/sysinstall/Makefile
+++ b/release/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
diff --git a/release/sysinstall/main.c b/release/sysinstall/main.c
index 37f156c..3c5502e 100644
--- a/release/sysinstall/main.c
+++ b/release/sysinstall/main.c
@@ -4,7 +4,7 @@
  * This is probably the last attempt in the `sysinstall' line, the next
  * generation being slated for what's essentially a complete rewrite.
  *
- * $Id: main.c,v 1.51 1999/02/05 22:15:50 jkh Exp $
+ * $Id: main.c,v 1.52 1999/06/17 19:04:55 markm Exp $
  *
  * Copyright (c) 1995
  *	Jordan Hubbard.  All rights reserved.
@@ -35,6 +35,7 @@
  */
 
 #include "sysinstall.h"
+#include "pccard_conf.h"
 #include <sys/signal.h>
 #include <sys/fcntl.h>
 
diff --git a/release/sysinstall/pccard.c b/release/sysinstall/pccard.c
index 4c122d8..48cc1ac 100644
--- a/release/sysinstall/pccard.c
+++ b/release/sysinstall/pccard.c
@@ -1,7 +1,7 @@
 /*
  * PC-card support for sysinstall
  *
- * $Id: pccard.c,v 1.2 1999/06/30 05:04:37 hosokawa Exp $
+ * $Id: pccard.c,v 1.4 1999/07/04 15:54:14 hosokawa Exp $
  *
  * Copyright (c) 1997-1999
  *	Tatsumi Hosokawa <hosokawa@jp.FreeBSD.org>.  All rights reserved.
@@ -15,6 +15,7 @@
  */
 
 #include "sysinstall.h"
+#include "pccard_conf.h"
 #include <sys/fcntl.h>
 #include <sys/time.h>
 #include <pccard/cardinfo.h>