From 579d94f4e16051496096486983e0680876541924 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <saw@online.de>
Date: Sat, 25 Feb 2012 20:08:02 +0100
Subject: [PATCH] puffs: Install some headers and remove now unnecessary -I's
 in Makefiles.

---
 etc/mtree/BSD.include.dist  | 4 ++++
 include/Makefile            | 4 ++--
 lib/libpuffs/Makefile       | 2 +-
 lib/librefuse/Makefile      | 2 +-
 usr.sbin/puffs/Makefile.inc | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 5a07d89458..6538934cfb 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -73,6 +73,8 @@
             ..
             ppi
             ..
+            putter
+            ..
         ..
         netif
             wi
@@ -316,6 +318,8 @@
         ..
         nwfs
         ..
+        puffs
+        ..
         udf
         ..
         ufs
diff --git a/include/Makefile b/include/Makefile
index 6bf9d3989c..0c3b424942 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -80,10 +80,10 @@ LSUBDIRS=	bus/cam bus/cam/scsi \
 	netproto/key netproto/natm netproto/ncp netproto/smb \
 	netproto/atm/ipatm netproto/atm/sigpvc netproto/atm/spans \
 	netproto/atm/uni netproto/802_11 netproto/mpls \
-	vfs/isofs/cd9660 \
+	vfs/isofs/cd9660 vfs/puffs \
 	dev/disk/mpt/mpilib \
 	dev/disk/dm \
-	dev/misc/lpt dev/misc/ppi \
+	dev/misc/lpt dev/misc/ppi dev/misc/putter \
 	dev/netif/wi \
 	dev/raid/ciss dev/raid/mfi \
 	dev/video/bktr dev/video/meteor libprop
diff --git a/lib/libpuffs/Makefile b/lib/libpuffs/Makefile
index 041e0c5003..75bf701f1c 100644
--- a/lib/libpuffs/Makefile
+++ b/lib/libpuffs/Makefile
@@ -11,6 +11,6 @@ SRCS=		puffs.c callcontext.c creds.c dispatcher.c flush.c	\
 MAN=		puffs.3 puffs_cc.3 puffs_cred.3 puffs_flush.3		\
 		puffs_framebuf.3 puffs_node.3 puffs_ops.3 puffs_path.3
 INCS=		puffs.h puffsdump.h
-CFLAGS+=	-I${.CURDIR}/../../sys -I${.CURDIR}/../../sbin/mount
+CFLAGS+=	-I${.CURDIR}/../../sbin/mount
 
 .include <bsd.lib.mk>
diff --git a/lib/librefuse/Makefile b/lib/librefuse/Makefile
index 99062b9a7d..dd29cc5960 100644
--- a/lib/librefuse/Makefile
+++ b/lib/librefuse/Makefile
@@ -8,7 +8,7 @@ FUSE_OPT_DEBUG_FLAGS=	-g -DFUSE_OPT_DEBUG
 
 SRCROOT=	${.CURDIR}/../..
 CFLAGS+=	${FUSE_OPT_DEBUG_FLAGS}
-CFLAGS+=	-I${SRCROOT}/lib/libpuffs -I${SRCROOT}/sys -I.
+CFLAGS+=	-I${SRCROOT}/lib/libpuffs -I.
 SRCS=		refuse.c refuse_opt.c
 MAN=		refuse.3
 WARNS=		2
diff --git a/usr.sbin/puffs/Makefile.inc b/usr.sbin/puffs/Makefile.inc
index 6e4aaf0594..183e6fe8d2 100644
--- a/usr.sbin/puffs/Makefile.inc
+++ b/usr.sbin/puffs/Makefile.inc
@@ -4,7 +4,7 @@ MOUNT=	${.CURDIR}/../../../sbin/mount
 
 WARNS?=	2
 
-CFLAGS+=-I${MOUNT} -I${.CURDIR}/../../../sys
+CFLAGS+=-I${MOUNT}
 
 LDADD=	-lpuffs
 DPADD=	${LIBPUFFS}
-- 
2.41.0