diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 index baafc48fe7..5833af70b8 100644 --- a/config/zfs-build.m4 +++ b/config/zfs-build.m4 @@ -211,9 +211,6 @@ AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [ 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} @@ -223,17 +220,15 @@ AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [ AC_DEFUN([ZFS_AC_CONFIG], [ 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` AC_SUBST(UNAME) AC_SUBST(TOPDIR) AC_SUBST(BUILDDIR) - AC_SUBST(ZFSDIR) AC_SUBST(LIBDIR) AC_SUBST(CMDDIR) AC_SUBST(MODDIR)