Date: Sun, 17 Sep 2000 18:42:19 -0600 From: Warner Losh <imp@village.org> To: arch@freebsd.org Subject: Comments requested: automatic hook for mergemaster Message-ID: <200009180042.SAA26812@harmony.village.org>
next in thread | raw e-mail | index | archive | help
Comments on the following.
Warner
Index: Makefile.inc1
===================================================================
RCS file: /home/imp/FreeBSD/CVS/src/Makefile.inc1,v
retrieving revision 1.169
diff -u -r1.169 Makefile.inc1
--- Makefile.inc1 2000/09/09 14:37:06 1.169
+++ Makefile.inc1 2000/09/18 00:41:05
@@ -305,6 +305,9 @@
done
cd ${.CURDIR}; ${IMAKE} reinstall
rm -rf ${INSTALLTMP}
+.if defined(DO_MERGEMASTER)
+ mergemaster
+.endif
#
# reinstall
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-arch" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200009180042.SAA26812>