diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386 index c1af1d03a9b6..bd0d627421a1 100644 --- a/sys/conf/Makefile.i386 +++ b/sys/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.110 1998/04/29 18:21:28 imp Exp $ +# $Id: Makefile.i386,v 1.111 1998/05/20 20:35:35 eivind Exp $ # # Makefile for FreeBSD # @@ -226,7 +226,7 @@ param.c: $S/conf/param.c param.o: param.c Makefile ${CC} -c ${CFLAGS} ${PARAM} param.c -vers.o: $S/sys/param.h ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT} ${CC} ${CFLAGS} -c vers.c diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index c1af1d03a9b6..bd0d627421a1 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.110 1998/04/29 18:21:28 imp Exp $ +# $Id: Makefile.i386,v 1.111 1998/05/20 20:35:35 eivind Exp $ # # Makefile for FreeBSD # @@ -226,7 +226,7 @@ param.c: $S/conf/param.c param.o: param.c Makefile ${CC} -c ${CFLAGS} ${PARAM} param.c -vers.o: $S/sys/param.h ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT} ${CC} ${CFLAGS} -c vers.c diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index cd86bfec53f4..689b1a94c599 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -32,7 +32,7 @@ # SUCH DAMAGE. # # @(#)newvers.sh 8.1 (Berkeley) 4/20/94 -# $Id: newvers.sh,v 1.34 1997/09/24 04:36:19 jdp Exp $ +# $Id: newvers.sh,v 1.35 1998/05/20 20:35:39 eivind Exp $ TYPE="FreeBSD" REVISION="3.0" @@ -44,8 +44,7 @@ if [ "X${SNAPDATE}" != "X" ]; then fi VERSION="${TYPE} ${RELEASE}" -RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \ - $(dirname $0)/../sys/param.h) +RELDATE="300001" b=share/examples/etc/bsd-style-copyright year=`date '+%Y'` diff --git a/sys/i386/conf/Makefile.i386 b/sys/i386/conf/Makefile.i386 index c1af1d03a9b6..bd0d627421a1 100644 --- a/sys/i386/conf/Makefile.i386 +++ b/sys/i386/conf/Makefile.i386 @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $Id: Makefile.i386,v 1.110 1998/04/29 18:21:28 imp Exp $ +# $Id: Makefile.i386,v 1.111 1998/05/20 20:35:35 eivind Exp $ # # Makefile for FreeBSD # @@ -226,7 +226,7 @@ param.c: $S/conf/param.c param.o: param.c Makefile ${CC} -c ${CFLAGS} ${PARAM} param.c -vers.o: $S/sys/param.h ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} +vers.o: ${SYSTEM_DEP} ${SYSTEM_SWAP_DEP} sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT} ${CC} ${CFLAGS} -c vers.c diff --git a/sys/sys/param.h b/sys/sys/param.h index a3fb30acbc4e..37e372d0abc8 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $Id: param.h,v 1.28 1998/03/28 10:33:22 bde Exp $ + * $Id: param.h,v 1.29 1998/05/20 20:35:42 eivind Exp $ */ #ifndef _SYS_PARAM_H_ @@ -45,8 +45,6 @@ #define BSD 199506 /* System version (year & month). */ #define BSD4_3 1 #define BSD4_4 1 -#undef __FreeBSD_version -#define __FreeBSD_version 300001 /* Master version, propagated to newvers */ #ifndef NULL #define NULL 0