diff --git a/Makefile.in b/Makefile.in index 1f83ce4e66..d602dac5f2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -152,6 +152,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 1cd295b57c..8ddaed68a1 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -117,6 +117,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index 402b2ccfc6..2f15a6cf34 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -134,6 +134,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/cmd/zdump/Makefile.in b/cmd/zdump/Makefile.in index 08676ea9fb..bac2699fab 100644 --- a/cmd/zdump/Makefile.in +++ b/cmd/zdump/Makefile.in @@ -134,6 +134,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index a8bf20c903..7769345f16 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -134,6 +134,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index e25676bf4e..2424e6ce17 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -134,6 +134,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index 043b2f969c..bbddeb12a2 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -129,6 +129,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index d357ba769d..493e1ffbf8 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -135,6 +135,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 75c3a0b54e..266ae3da53 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -134,6 +134,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/config/Makefile.in b/config/Makefile.in index 8e163ac179..2451b5ae61 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -109,6 +109,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/config/kernel.m4 b/config/kernel.m4 index df62b2f258..e24bcb09ab 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 @@ -4,7 +4,7 @@ dnl # AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ dnl # Kernel build make options dnl # KERNELMAKE_PARAMS="V=1" # Enable verbose module build - KERNELMAKE_PARAMS= + KERNELMAKE_PARAMS="V=1" dnl # Kernel build cpp flags KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL " diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index 149b96a04a..baafc48fe7 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -217,15 +217,17 @@ AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [ echo "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG} echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG} echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} + echo "MODDIR=${MODDIR}" >>${SCRIPT_CONFIG} ]) AC_DEFUN([ZFS_AC_CONFIG], [ TOPDIR=`/bin/pwd` - BUILDDIR=$ZFS_META_NAME #+$zfsconfig + BUILDDIR=$ZFS_META_NAME ZFSDIR=$TOPDIR/$BUILDDIR LIBDIR=$ZFSDIR/lib - CMDDIR=$ZFSDIR/zcmd + CMDDIR=$ZFSDIR/cmd + MODDIR=$ZFSDIR/module UNAME=`uname -r | cut -d- -f1` AC_SUBST(UNAME) @@ -234,6 +236,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [ AC_SUBST(ZFSDIR) AC_SUBST(LIBDIR) AC_SUBST(CMDDIR) + AC_SUBST(MODDIR) AC_SUBST(UNAME) AC_ARG_WITH([zfs-config], diff --git a/configure b/configure index f75b4105b0..d95aa303ef 100755 --- a/configure +++ b/configure @@ -462,7 +462,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ kmoduledir splsrc splsymvers UNAME TOPDIR BUILDDIR ZFSDIR LIBDIR CMDDIR KERNELMAKE_PARAMS KERNELCPPFLAGS HOSTCFLAGS LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ kmoduledir splsrc splsymvers UNAME TOPDIR BUILDDIR ZFSDIR LIBDIR CMDDIR MODDIR KERNELMAKE_PARAMS KERNELCPPFLAGS HOSTCFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -19162,10 +19162,11 @@ echo "${ECHO_T}$splsymvers" >&6 TOPDIR=`/bin/pwd` - BUILDDIR=$ZFS_META_NAME #+$zfsconfig + BUILDDIR=$ZFS_META_NAME ZFSDIR=$TOPDIR/$BUILDDIR LIBDIR=$ZFSDIR/lib - CMDDIR=$ZFSDIR/zcmd + CMDDIR=$ZFSDIR/cmd + MODDIR=$ZFSDIR/module UNAME=`uname -r | cut -d- -f1` @@ -19177,6 +19178,7 @@ echo "${ECHO_T}$splsymvers" >&6 + # Check whether --with-zfs-config or --without-zfs-config was given. if test "${with_zfs_config+set}" = set; then withval="$with_zfs_config" @@ -19190,7 +19192,7 @@ echo "${ECHO_T}$zfsconfig" >&6; case "$zfsconfig" in kernel) - KERNELMAKE_PARAMS= + KERNELMAKE_PARAMS="V=1" KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL " KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unknown-pragmas " @@ -19603,7 +19605,7 @@ echo "${ECHO_T}yes" >&6 ;; all) - KERNELMAKE_PARAMS= + KERNELMAKE_PARAMS="V=1" KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL " KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unknown-pragmas " @@ -20043,6 +20045,7 @@ echo "$as_me: error: Bad value \"$zfsconfig\" for --with-config, echo "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG} echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG} echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} + echo "MODDIR=${MODDIR}" >>${SCRIPT_CONFIG} @@ -20866,6 +20869,7 @@ s,@BUILDDIR@,$BUILDDIR,;t t s,@ZFSDIR@,$ZFSDIR,;t t s,@LIBDIR@,$LIBDIR,;t t s,@CMDDIR@,$CMDDIR,;t t +s,@MODDIR@,$MODDIR,;t t s,@KERNELMAKE_PARAMS@,$KERNELMAKE_PARAMS,;t t s,@KERNELCPPFLAGS@,$KERNELCPPFLAGS,;t t s,@HOSTCFLAGS@,$HOSTCFLAGS,;t t diff --git a/doc/Makefile.in b/doc/Makefile.in index 9febe82dc1..633eaddb8c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -108,6 +108,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/lib/Makefile.in b/lib/Makefile.in index e75c778abd..d2a464057c 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -117,6 +117,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index d3e80b362a..ac5ec43674 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -134,6 +134,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index 4635ca2b24..e64608dbc0 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -135,6 +135,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index 6ebc9a6fe5..eb20a38e2b 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -139,6 +139,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index b0e2297734..0991d7e108 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -136,6 +136,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 0752d505be..42aa2b2184 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -137,6 +137,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 41360e0ec8..015a345c74 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -148,6 +148,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 8baa018fd4..1b3a416ea6 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -108,6 +108,7 @@ MAINT = @MAINT@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ +MODDIR = @MODDIR@ OBJEXT = @OBJEXT@ PACKAGE = @PACKAGE@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@