diff --git a/Makefile.in b/Makefile.in index d602dac5f2..0cb30f61d9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -169,7 +169,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/Makefile.in b/cmd/Makefile.in index 8ddaed68a1..95a2c19d93 100644 --- a/cmd/Makefile.in +++ b/cmd/Makefile.in @@ -134,7 +134,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in index 2f15a6cf34..5bf7a7462e 100644 --- a/cmd/zdb/Makefile.in +++ b/cmd/zdb/Makefile.in @@ -151,7 +151,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zdump/Makefile.in b/cmd/zdump/Makefile.in index bac2699fab..d4a3cf6db8 100644 --- a/cmd/zdump/Makefile.in +++ b/cmd/zdump/Makefile.in @@ -151,7 +151,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in index 7769345f16..694d4608ea 100644 --- a/cmd/zfs/Makefile.in +++ b/cmd/zfs/Makefile.in @@ -151,7 +151,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in index 2424e6ce17..f06d15b312 100644 --- a/cmd/zinject/Makefile.in +++ b/cmd/zinject/Makefile.in @@ -151,7 +151,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in index bbddeb12a2..14940724b7 100644 --- a/cmd/zpios/Makefile.in +++ b/cmd/zpios/Makefile.in @@ -146,7 +146,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in index 493e1ffbf8..1a5fc05eca 100644 --- a/cmd/zpool/Makefile.in +++ b/cmd/zpool/Makefile.in @@ -152,7 +152,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in index 266ae3da53..281d04cdf4 100644 --- a/cmd/ztest/Makefile.in +++ b/cmd/ztest/Makefile.in @@ -151,7 +151,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/config/Makefile.in b/config/Makefile.in index 2451b5ae61..368af65951 100644 --- a/config/Makefile.in +++ b/config/Makefile.in @@ -126,7 +126,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/configure b/configure index d95aa303ef..f651add351 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 MODDIR 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 LIBDIR CMDDIR MODDIR KERNELMAKE_PARAMS KERNELCPPFLAGS HOSTCFLAGS LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -19162,11 +19162,10 @@ echo "${ECHO_T}$splsymvers" >&6 TOPDIR=`/bin/pwd` - BUILDDIR=$ZFS_META_NAME - ZFSDIR=$TOPDIR/$BUILDDIR - LIBDIR=$ZFSDIR/lib - CMDDIR=$ZFSDIR/cmd - MODDIR=$ZFSDIR/module + BUILDDIR=$TOPDIR + LIBDIR=$TOPDIR/lib + CMDDIR=$TOPDIR/cmd + MODDIR=$TOPDIR/module UNAME=`uname -r | cut -d- -f1` @@ -19178,7 +19177,6 @@ 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" @@ -20039,9 +20037,6 @@ echo "$as_me: error: Bad value \"$zfsconfig\" for --with-config, echo "SPLSRCVER=$splsrcver" >>${SCRIPT_CONFIG} echo "SPLSYMVERS=$splsymvers" >>${SCRIPT_CONFIG} echo >>${SCRIPT_CONFIG} - echo "ZFSSRC=${TOPDIR}/src" >>${SCRIPT_CONFIG} - echo "ZFSBUILD=${ZFSDIR}" >>${SCRIPT_CONFIG} - echo >>${SCRIPT_CONFIG} echo "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG} echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG} echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} @@ -20866,7 +20861,6 @@ s,@splsymvers@,$splsymvers,;t t s,@UNAME@,$UNAME,;t t s,@TOPDIR@,$TOPDIR,;t t 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 diff --git a/doc/Makefile.in b/doc/Makefile.in index 633eaddb8c..608f0c2e85 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -125,7 +125,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/Makefile.in b/lib/Makefile.in index d2a464057c..b2bff24084 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -134,7 +134,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in index ac5ec43674..9b95a5fdf2 100644 --- a/lib/libavl/Makefile.in +++ b/lib/libavl/Makefile.in @@ -151,7 +151,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in index e64608dbc0..cb9cb2df64 100644 --- a/lib/libnvpair/Makefile.in +++ b/lib/libnvpair/Makefile.in @@ -152,7 +152,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in index eb20a38e2b..217e211ec6 100644 --- a/lib/libspl/Makefile.in +++ b/lib/libspl/Makefile.in @@ -156,7 +156,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in index 0991d7e108..03684279b1 100644 --- a/lib/libuutil/Makefile.in +++ b/lib/libuutil/Makefile.in @@ -153,7 +153,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in index 42aa2b2184..6ef9f01d66 100644 --- a/lib/libzfs/Makefile.in +++ b/lib/libzfs/Makefile.in @@ -154,7 +154,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in index 015a345c74..f6af41e6be 100644 --- a/lib/libzpool/Makefile.in +++ b/lib/libzpool/Makefile.in @@ -165,7 +165,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index 1b3a416ea6..f4b76738ce 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -125,7 +125,6 @@ STRIP = @STRIP@ TOPDIR = @TOPDIR@ UNAME = @UNAME@ VERSION = @VERSION@ -ZFSDIR = @ZFSDIR@ ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_DATA = @ZFS_META_DATA@