diff options
| author | obrien <obrien@FreeBSD.org> | 2001-09-06 17:52:59 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2001-09-06 17:52:59 +0000 |
| commit | 35e8b8b0577801c3cb09674ea1b109ba12e0dbd9 (patch) | |
| tree | 2c73691eec48a269c76268cea117166694417158 /usr.sbin/amd | |
| parent | 7ebc549651b07749b907b3a6007d74c5ea1eb202 (diff) | |
| download | FreeBSD-src-35e8b8b0577801c3cb09674ea1b109ba12e0dbd9.zip FreeBSD-src-35e8b8b0577801c3cb09674ea1b109ba12e0dbd9.tar.gz | |
I was missing the HOST_OS_VERSION setting in the fall-back case.
Also, the script was too position dependant. We now have make(1) pass in
the file to grub around in to get our settings from.
Diffstat (limited to 'usr.sbin/amd')
| -rw-r--r-- | usr.sbin/amd/include/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/amd/include/newvers.sh | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/amd/include/Makefile b/usr.sbin/amd/include/Makefile index 2fc5118..e7f911c 100644 --- a/usr.sbin/amd/include/Makefile +++ b/usr.sbin/amd/include/Makefile @@ -14,6 +14,6 @@ all: ${SRCS} config_local.h: newvers.sh @rm -f ${.TARGET} - sh ${.ALLSRC} > ${.TARGET} + sh ${.ALLSRC} ${.CURDIR}/../../../sys/conf/newvers.sh > ${.TARGET} .include <bsd.prog.mk> diff --git a/usr.sbin/amd/include/newvers.sh b/usr.sbin/amd/include/newvers.sh index bc7c49b..21f748b 100644 --- a/usr.sbin/amd/include/newvers.sh +++ b/usr.sbin/amd/include/newvers.sh @@ -4,8 +4,8 @@ # Generate local configuration parameters for amd # -if [ -e ../../../sys/conf/newvers.sh ]; then - eval `egrep '^[A-Z]+=' ../../../sys/conf/newvers.sh | grep -v COPYRIGHT` +if [ -e $1 ]; then + eval `egrep '^[A-Z]+=' $1 | grep -v COPYRIGHT` OS=`echo ${TYPE} | tr '[A-Z]' '[a-z]'` echo '/* Define name and version of host machine (eg. solaris2.5.1) */' echo "#define HOST_OS \"${OS}${REVISION}\"" @@ -23,6 +23,9 @@ cat << __NO_newvers_sh /* Define only name of host machine OS (eg. solaris2) */ #define HOST_OS_NAME "`uname -s | tr '[A-Z]' '[a-z]'``uname -r | sed -e 's/\..*$//'`" +/* Define only version of host machine (eg. 2.5.1) */ +#define HOST_OS_VERSION "`uname -r`" + __NO_newvers_sh fi |
