Date: Fri, 12 Dec 2014 19:49:01 +0300 From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: Dag-Erling =?utf-8?B?U23DuHJncmF2?= <des@FreeBSD.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r275659 - head/bin/freebsd-version Message-ID: <20141212164901.GB65403@hades.panopticon> In-Reply-To: <201412100312.sBA3CNEm081570@svn.freebsd.org> References: <201412100312.sBA3CNEm081570@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
* Dag-Erling Sm=C3=B8rgrav (des@FreeBSD.org) wrote:
> Log:
> Fix dependency on newvers.sh
> =20
> Noticed by: marck
> MFC after: 1 week
This is wrong. Target uses ${.ALLSRC} to which you've appended ${NEWVERS}=
,
and now the target appends newvers.sh contents to freebsd-version script.
> Modified:
> head/bin/freebsd-version/Makefile
>=20
> Modified: head/bin/freebsd-version/Makefile
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/bin/freebsd-version/Makefile Tue Dec 9 23:26:47 2014 (r275658=
)
> +++ head/bin/freebsd-version/Makefile Wed Dec 10 03:12:22 2014 (r275659=
)
> @@ -5,8 +5,7 @@ MAN =3D freebsd-version.1
> CLEANFILES =3D freebsd-version.sh
> NEWVERS =3D ${.CURDIR}/../../sys/conf/newvers.sh
> =20
> -freebsd-version.sh.in: ${NEWVERS}
> -freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in
> +freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in ${NEWVERS}
> eval $$(egrep '^(TYPE|REVISION|BRANCH)=3D' ${NEWVERS}) ; \
> if ! sed -e "\
> s/@@TYPE@@/$${TYPE}/g; \
--=20
Dmitry Marakasov . 55B5 0596 FF1E 8D84 5F56 9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru ..: jabber: amdmi3@jabber.ru http://www.amdmi3.ru
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20141212164901.GB65403>