Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk

This commit is contained in:
Brian Behlendorf 2009-01-05 13:47:12 -08:00
commit eea4cc8e0e
2 changed files with 3 additions and 1 deletions

View File

@ -10,7 +10,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zfs/include \ -I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
lib_LTLIBRARIES = libzfs.la lib_LTLIBRARIES = libzfs.la

View File

@ -7,6 +7,7 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zcommon/include \ -I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \ -I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include \ -I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include \
-I${top_srcdir}/module/zfs/include -I${top_srcdir}/module/zfs/include
lib_LTLIBRARIES = libzpool.la lib_LTLIBRARIES = libzpool.la