From fcd12d096e8077dd09b489fe776f52fb43eff76f Mon Sep 17 00:00:00 2001 From: Peter Wemm Date: Fri, 10 Aug 2001 11:24:23 +0000 Subject: Use some slightly less horrible make magic for doing the version stuff. --- gnu/usr.bin/cvs/cvs/Makefile | 14 +++++--------- gnu/usr.bin/cvs/cvsbug/Makefile | 15 +++++++-------- 2 files changed, 12 insertions(+), 17 deletions(-) (limited to 'gnu') diff --git a/gnu/usr.bin/cvs/cvs/Makefile b/gnu/usr.bin/cvs/cvs/Makefile index 1d6297463244..4aabe190ba6d 100644 --- a/gnu/usr.bin/cvs/cvs/Makefile +++ b/gnu/usr.bin/cvs/cvs/Makefile @@ -40,16 +40,12 @@ DISTRIBUTION= krb4 CFLAGS+= -DENCRYPTION .endif -CLEANFILES+= version.c ver +CLEANFILES+= version.c +VERSION!= sed < ${CVSDIR}/configure \ + -e '/^VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q -ver: configure - echo > ${.TARGET} `sed < ${.ALLSRC} \ - -e '/^VERSION=/!d' \ - -e 's/.*=\(.*\)/\1/' \ - -e q` - -version.c: ver version.c.in - sed -e "s,@VERSION@,`cat ver`,g" ${CVSDIR}/src/version.c.in > ${.TARGET} +version.c: version.c.in + sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" ${.ALLSRC} > ${.TARGET} # # Regression test support diff --git a/gnu/usr.bin/cvs/cvsbug/Makefile b/gnu/usr.bin/cvs/cvsbug/Makefile index 97bf94023919..f54ac6f2fa87 100644 --- a/gnu/usr.bin/cvs/cvsbug/Makefile +++ b/gnu/usr.bin/cvs/cvsbug/Makefile @@ -11,15 +11,14 @@ MAINTAINER= peter@FreeBSD.org SCRIPTS= cvsbug MAN= cvsbug.8 -CLEANFILES+= cvsbug ver +CLEANFILES+= version.c +VERSION!= sed < ${CVSDIR}/configure \ + -e '/^VERSION=/!d' -e 's/.*=\(.*\)/\1/' -e q -ver: configure - echo > ${.TARGET} `sed < ${.ALLSRC} \ - -e '/^VERSION=/!d' \ - -e 's/.*=\(.*\)/\1/' \ - -e q` +version.c: version.c.in + sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" ${.ALLSRC} > ${.TARGET} -cvsbug: ver cvsbug.in - sed -e "s,@VERSION@,`cat ver`,g" ${CVSDIR}/src/cvsbug.in > ${.TARGET} +cvsbug: cvsbug.in + sed -e "s,@VERSION@,${VERSION}-FreeBSD,g" ${.ALLSRC} > ${.TARGET} .include -- cgit v1.3