On Sun, Jul 06, 2003 at 08:21:14PM -0700, Gregory Neil Shapiro wrote: > > > mergemaster -dv > > > > [snip] > > > > cd /usr/src/etc/sendmail; make distribution > > install -o root -g wheel -m 644 /usr/src/etc/sendmail/freebsd.mc freebsd.cf > > /var/tmp/temproot.0707.11.55/etc/mail > > install: freebsd.cf: No such file or directory > > *** Error code 71 > > Thanks, I just committed a fix for this. > Er,
The correct fix would be to revert this change from sendmail/Makefile, and fix mergemaster(8) instead, as shown in the attached patch. The "distribution" target of src/etc/Makefile is part of the standard "distribute" target, and as such it's just a specialized version of the "install" target that should not _build_ anything (and that was fixed in rev. 1.23). To build things, one needs to call the "all" target, which the attached patch simply does. It's just a pure coincidence that the "distribution" part of src/etc/Makefile does not need to build anything (in the object directory). Can you please test it and commit? Cheers, -- Ruslan Ermilov Sysadmin and DBA, [EMAIL PROTECTED] Sunbay Software Ltd, [EMAIL PROTECTED] FreeBSD committer
Index: mergemaster.sh
===================================================================
RCS file: /home/ncvs/src/usr.sbin/mergemaster/mergemaster.sh,v
retrieving revision 1.46
diff -u -r1.46 mergemaster.sh
--- mergemaster.sh 3 May 2003 06:35:19 -0000 1.46
+++ mergemaster.sh 22 Jul 2003 12:31:23 -0000
@@ -508,6 +508,7 @@
esac
make DESTDIR=${TEMPROOT} distrib-dirs &&
make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj obj &&
+ make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj all &&
make MAKEOBJDIRPREFIX=${TEMPROOT}/usr/obj DESTDIR=${TEMPROOT} \
distribution;} ||
{ echo '';
pgp00000.pgp
Description: PGP signature
