First step of META build system cleanup

[zfs.git] / config / zfs-build.m4

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 5eebdd4..aba0be6 100644 (file)
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -17,14 +17,19 @@ AC_DEFUN([ZFS_AC_CONFIG], [
        . ./config/$zfsconfig
 
        TOPDIR=`/bin/pwd`
-       ZFSDIR=${TOPDIR}/$BUILDDIR
+       BUILDDIR=$META_NAME #+$zfsconfig
+       ZFSDIR=$TOPDIR/$BUILDDIR
        LIBDIR=$ZFSDIR/lib
        CMDDIR=$ZFSDIR/zcmd
+       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(UNAME)
 ])
 
 AC_DEFUN([ZFS_AC_KERNEL], [
@@ -243,9 +248,9 @@ AC_DEFUN([ZFS_AC_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}
+       echo "TOPDIR=${TOPDIR}"           >>${SCRIPT_CONFIG}
+       echo "LIBDIR=${LIBDIR}"           >>${SCRIPT_CONFIG}
+       echo "CMDDIR=${CMDDIR}"           >>${SCRIPT_CONFIG}
 ])
 
 dnl #