From 6a116d459cb7e47eb25742b4fd328f09728150dc Mon Sep 17 00:00:00 2001
From: veego <veego@NetBSD.org>
Date: Sun, 21 Sep 1997 17:02:33 +0000
Subject: [PATCH] Resolve conflicts from the merge of ipf 3.2beta5.

---
 usr.sbin/ipf/Makefile     | 5 ++++-
 usr.sbin/ipf/Makefile.inc | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/ipf/Makefile b/usr.sbin/ipf/Makefile
index 5e3797f89188..c2730171c692 100644
--- a/usr.sbin/ipf/Makefile
+++ b/usr.sbin/ipf/Makefile
@@ -1,5 +1,8 @@
-#	$NetBSD: Makefile,v 1.3 1997/04/12 23:57:37 mrg Exp $
+#	$NetBSD: Makefile,v 1.4 1997/09/21 17:02:33 veego Exp $
 
 SUBDIR=		ipf ipfstat ipmon ipnat ipftest ipsend iptest
+.if make(install)
+SUBDIR+=	rules
+.endif
 
 .include <bsd.subdir.mk>
diff --git a/usr.sbin/ipf/Makefile.inc b/usr.sbin/ipf/Makefile.inc
index bea5fcea7ce0..2229e2283408 100644
--- a/usr.sbin/ipf/Makefile.inc
+++ b/usr.sbin/ipf/Makefile.inc
@@ -1,3 +1,5 @@
-#	$NetBSD: Makefile.inc,v 1.2 1997/01/20 07:33:57 mycroft Exp $
+#	$NetBSD: Makefile.inc,v 1.3 1997/09/21 17:02:34 veego Exp $
+
+WARNS?=	1
 
 .include "${.CURDIR}/../../Makefile.inc"