diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index 7f81ec390954..2ab26179d144 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -1,19 +1,21 @@ # $FreeBSD$ .include DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H NTPDEFS= -DSYS_FREEBSD # CLOCKDEFS= # -DLOCAL_CLOCK -DPST -DWWVB -DAS2201 -DGOES -DGPSTM -DOMEGA \ # -DLEITCH -DTRAK -DACTS -DATOM -DDATUM -DHEATH -DMSFEES \ # -DMX4200 -DNMEA -DBOEDER CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} .if ${MK_OPENSSL} != "no" CFLAGS+= -DOPENSSL -DUSE_OPENSSL_CRYPTO_RAND -DAUTOKEY .endif WARNS?= 0 +.export ECHO + .include "../Makefile.inc" diff --git a/usr.sbin/ntp/scripts/mkver b/usr.sbin/ntp/scripts/mkver index 4e81652f8135..2d3e39dbd034 100755 --- a/usr.sbin/ntp/scripts/mkver +++ b/usr.sbin/ntp/scripts/mkver @@ -1,44 +1,46 @@ #!/bin/sh # # $FreeBSD$ # PROG=${1-UNKNOWN} +: ${ECHO:=echo} + ConfStr="$PROG" ConfStr="$ConfStr 4.2.8p12" case "$CSET" in '') ;; *) ConfStr="$ConfStr@$CSET" ;; esac case "" in '') case "1" in '') ;; *) ConfStr="${ConfStr}-a" ;; esac ;; *) ConfStr="${ConfStr}-r" ;; esac if [ ! -f .version ]; then echo 0 > .version fi RUN="`cat .version`" RUN="`expr $RUN + 1`" echo $RUN > .version ConfStr="$ConfStr (${RUN})" -echo "Version <${ConfStr}>"; +${ECHO} "Version <${ConfStr}>"; rm -f version.c cat > version.c << -EoF- /* * version file for $PROG */ #include const char * Version = "${ConfStr}"; -EoF-