X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=config%2Fzfs-build.m4;h=aba0be6a7e8adae5a437c5e9de3659282c46294d;hb=c9a913795679c3f5895de8258f31269530c5eaed;hp=5eebdd48e276037bfd5943c9dbc0aae9ec155d3f;hpb=a54f863a14edbbd2c5bd14774c8f1ead32ed7bf5;p=zfs.git

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index 5eebdd4..aba0be6 100644
--- 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 #