Date: Tue, 21 Mar 2006 08:29:01 +0200 From: Ruslan Ermilov <ru@freebsd.org> To: Steve Kargl <sgk@troutmask.apl.washington.edu>, freebsd-current@freebsd.org Subject: Re: mergemaster broken? Message-ID: <20060321062901.GB77849@ip.net.ua> In-Reply-To: <20060320234006.GV35129@funkthat.com> References: <20060320221741.GA13699@troutmask.apl.washington.edu> <20060320230009.GA55254@troutmask.apl.washington.edu> <20060320231604.GH83781@ip.net.ua> <20060320232746.GI83781@ip.net.ua> <20060320234006.GV35129@funkthat.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--lEGEL1/lMxI0MVQ2
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Mon, Mar 20, 2006 at 03:40:06PM -0800, John-Mark Gurney wrote:
> Ruslan Ermilov wrote this message on Tue, Mar 21, 2006 at 01:27 +0200:
> > On Tue, Mar 21, 2006 at 01:16:04AM +0200, Ruslan Ermilov wrote:
> > > On Mon, Mar 20, 2006 at 03:00:10PM -0800, Steve Kargl wrote:
> > > > On Mon, Mar 20, 2006 at 02:17:41PM -0800, Steve Kargl wrote:
> > [...]
> > > > > "/usr/src/etc/Makefile", line 206: Malformed conditional (${MK_SE=
NDMAIL} !=3D "no")
> > > > > "/usr/src/etc/Makefile", line 208: if-less endif
> > > > > make: fatal errors encountered -- cannot continue
> > > > >=20
> > > > > *** FATAL ERROR: Cannot 'cd' to /usr/src/etc and install files =
to
> > > > > the temproot environment
> > > > >=20
> > > >=20
> > > > This appears to be related to ru's recent Makefile sweep.
> > > >=20
> > > mergemaster(8) should be fixed to run "make distrib-dirs" and "make
> > > distribution" from /usr/src, not from /usr/src/etc.
> > >=20
> > The attached patch seems to work.
>=20
> Should we also document that -m is suppose to be src's etc dir instead
> of src? I've accidentally pointed -m at src, and then it does a make
> which is quite ammuzing as it's completely the wrong thing... Or now
> that we call outside of /etc, should we make -m really point to src,
> and have the proper calls add etc to the directory?
>=20
I didn't care looking into how -m is documented until now. :-)
OK, I will make it do what it ought to be, i.e. point at src/ top.
Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
--lEGEL1/lMxI0MVQ2
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQFEH50tqRfpzJluFF4RApYHAJ9ySV+zKuGsqGiCKx1N37jcFOGbfQCeJ61f
QSA8OfiH11dqm5RqwrsaGhY=
=AgZm
-----END PGP SIGNATURE-----
--lEGEL1/lMxI0MVQ2--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060321062901.GB77849>