git://git.camperquake.de
/
zfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge zvol.c changes from PSARC 2010/306 Read-only ZFS pools
[zfs.git]
/
include
/
Makefile.am
diff --git
a/include/Makefile.am
b/include/Makefile.am
index
0926c6a
..
8325a8e
100644
(file)
--- a/
include/Makefile.am
+++ b/
include/Makefile.am
@@
-1,6
+1,7
@@
-SUBDIRS = sys
+SUBDIRS =
linux
sys
COMMON_H = \
COMMON_H = \
+ $(top_srcdir)/include/zfeature_common.h \
$(top_srcdir)/include/zfs_comutil.h \
$(top_srcdir)/include/zfs_deleg.h \
$(top_srcdir)/include/zfs_fletcher.h \
$(top_srcdir)/include/zfs_comutil.h \
$(top_srcdir)/include/zfs_deleg.h \
$(top_srcdir)/include/zfs_fletcher.h \
@@
-27,6
+28,6
@@
libzfs_HEADERS = $(COMMON_H) $(USER_H)
endif
if CONFIG_KERNEL
endif
if CONFIG_KERNEL
-kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION)
+kerneldir = /usr/src/zfs-$(ZFS_META_VERSION)
-$(ZFS_META_RELEASE)
/$(LINUX_VERSION)
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif
kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
endif