From owner-freebsd-arch  Sun Sep 17 17:42:32 2000
Delivered-To: freebsd-arch@freebsd.org
Received: from rover.village.org (rover.village.org [204.144.255.49])
	by hub.freebsd.org (Postfix) with ESMTP id 6B07337B424
	for <arch@freebsd.org>; Sun, 17 Sep 2000 17:42:29 -0700 (PDT)
Received: from harmony.village.org (harmony.village.org [10.0.0.6])
	by rover.village.org (8.9.3/8.9.3) with ESMTP id SAA88164
	for <arch@freebsd.org>; Sun, 17 Sep 2000 18:42:27 -0600 (MDT)
	(envelope-from imp@harmony.village.org)
Received: from harmony.village.org (localhost.village.org [127.0.0.1]) by harmony.village.org (8.9.3/8.8.3) with ESMTP id SAA26812 for <arch@freebsd.org>; Sun, 17 Sep 2000 18:42:19 -0600 (MDT)
Message-Id: <200009180042.SAA26812@harmony.village.org>
To: arch@freebsd.org
Subject: Comments requested: automatic hook for mergemaster
Date: Sun, 17 Sep 2000 18:42:19 -0600
From: Warner Losh <imp@village.org>
Sender: owner-freebsd-arch@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG


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