diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-05-07 18:44:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2002-05-07 18:44:07 +0000 |
| commit | 2ea3f7af298faeb6d751bb68c7d3a911fc39c0a2 (patch) | |
| tree | ef4ffcb56a96a34d20e82dedb8be1f3f24983bcc | |
| parent | e3500453ce2b94b39af2ef626169742ebc17530c (diff) | |
fix conf file generation
| -rw-r--r-- | distrib/sparc64/bsd.rd/Makefile | 10 | ||||
| -rw-r--r-- | distrib/sparc64/ramdisk/Makefile | 5 | ||||
| -rw-r--r-- | distrib/sparc64/ramdiskB/Makefile | 5 |
3 files changed, 14 insertions, 6 deletions
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile index 91914efcb24..4d8fe9eacc2 100644 --- a/distrib/sparc64/bsd.rd/Makefile +++ b/distrib/sparc64/bsd.rd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2002/04/30 09:18:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2002/05/07 18:44:05 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -6,7 +6,6 @@ TOP= ${.CURDIR}/.. IMAGE= ramdisk${REV}.fs CBIN?= instbin LISTS?= ${.CURDIR}/list -CRUNCHCONF?= ${.CURDIR}/${CBIN}.conf UTILS?= ${TOP}/../miniroot MOUNT_POINT= /mnt @@ -118,9 +117,12 @@ install: cp bsd.rd ${DESTDIR}/snapshot/bsd.rd .endif -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +${CBIN}.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + +${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \ - -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF} + -c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CBIN}.conf ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c make -f ${CBIN}.mk all diff --git a/distrib/sparc64/ramdisk/Makefile b/distrib/sparc64/ramdisk/Makefile index 5032fb4fb7d..e661795c0a2 100644 --- a/distrib/sparc64/ramdisk/Makefile +++ b/distrib/sparc64/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2002/04/30 09:18:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.11 2002/05/07 18:44:05 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -113,6 +113,9 @@ unconfig: install: cp ${FLOPPY} ${DESTDIR}/snapshot/ +${CBIN}.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} diff --git a/distrib/sparc64/ramdiskB/Makefile b/distrib/sparc64/ramdiskB/Makefile index 35ec8264406..deb927be7e4 100644 --- a/distrib/sparc64/ramdiskB/Makefile +++ b/distrib/sparc64/ramdiskB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2002/04/30 09:18:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.5 2002/05/07 18:44:06 deraadt Exp $ TOP= ${.CURDIR}/.. @@ -113,6 +113,9 @@ unconfig: install: cp ${FLOPPY} ${DESTDIR}/snapshot/ +${CBIN}.conf: ${LISTS} + awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CBIN}.conf crunchgen -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} |