commit 22ecda441a921a0cc17ed43532480b2a33c34dac
Merge: 069fb55... 7b9a8f9...
Author: Yiannis Pericleous <[EMAIL PROTECTED]>
Date: Fri May 25 23:52:57 2007 -0400
Merge branch 'master' of story:/home/git/unionfs-odf into odf
diff --git a/fs/unionfs/Makefile b/fs/unionfs/Makefile
index
0a7c349f7a303cdb5d1e97eb4ed7a3152cd0eb49..dfbde56e048671f47b4dcc15535534c79fde5276
100644
--- a/fs/unionfs/Makefile
+++ b/fs/unionfs/Makefile
@@ -8,8 +8,12 @@ unionfs-y := subr.o dentry.o file.o inod
unionfs-$(CONFIG_UNION_FS_XATTR) += xattr.o
# If you want debugging output, please uncomment the following line
+# or put your options in a separate file in linux-x.y.z/fs/unionfs/local.mk
#CONFIG_UNIONFS_DEBUG=y
+# Allow users to override debug options in a separate file
+-include fs/unionfs/local.mk
+
ifeq ($(CONFIG_UNIONFS_DEBUG),y)
unionfs-y += debug.o
EXTRA_CFLAGS += -DUNIONFS_DEBUG=1
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
