Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts from the merge of ipf 3.2beta5.

Browse Source
This commit is contained in:
veego 1997-09-21 17:02:33 +00:00
parent 4dd2356bd7
commit 6a116d459c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/ipf/Makefile
View File

@ -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>

4
usr.sbin/ipf/Makefile.inc
View File

@ -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"