diff options
author | hosokawa <hosokawa@FreeBSD.org> | 1999-07-06 09:16:00 +0000 |
---|---|---|
committer | hosokawa <hosokawa@FreeBSD.org> | 1999-07-06 09:16:00 +0000 |
commit | 726ba02e48aa1eeb11994ec751de26b4eabcc7d8 (patch) | |
tree | da277e3b901f56a8eb24c8c84e3a9c9d1487c6f4 /release/sysinstall | |
parent | 44f61065e9f9be0ac85c4b9d76abe1c312ae14db (diff) | |
download | FreeBSD-src-726ba02e48aa1eeb11994ec751de26b4eabcc7d8.zip FreeBSD-src-726ba02e48aa1eeb11994ec751de26b4eabcc7d8.tar.gz |
Use #include <pccard_conf.h> instead of -DPCCARD.
Now we don't have to make clean before make boot.flp's.
Diffstat (limited to 'release/sysinstall')
-rw-r--r-- | release/sysinstall/Makefile | 20 | ||||
-rw-r--r-- | release/sysinstall/main.c | 3 | ||||
-rw-r--r-- | release/sysinstall/pccard.c | 3 |
3 files changed, 17 insertions, 9 deletions
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> |