Merge commit 'refs/top-bases/linux-arc' into linux-arc
This commit is contained in:
commit
562b275a1c
|
@ -211,9 +211,6 @@ AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [
|
||||||
echo "SPLSRCVER=$splsrcver" >>${SCRIPT_CONFIG}
|
echo "SPLSRCVER=$splsrcver" >>${SCRIPT_CONFIG}
|
||||||
echo "SPLSYMVERS=$splsymvers" >>${SCRIPT_CONFIG}
|
echo "SPLSYMVERS=$splsymvers" >>${SCRIPT_CONFIG}
|
||||||
echo >>${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 "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG}
|
||||||
echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG}
|
echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG}
|
||||||
echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG}
|
echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG}
|
||||||
|
@ -222,18 +219,18 @@ AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [
|
||||||
AC_DEFUN([ZFS_AC_CONFIG], [
|
AC_DEFUN([ZFS_AC_CONFIG], [
|
||||||
|
|
||||||
TOPDIR=`/bin/pwd`
|
TOPDIR=`/bin/pwd`
|
||||||
BUILDDIR=$ZFS_META_NAME #+$zfsconfig
|
BUILDDIR=$TOPDIR
|
||||||
ZFSDIR=$TOPDIR/$BUILDDIR
|
LIBDIR=$TOPDIR/lib
|
||||||
LIBDIR=$ZFSDIR/lib
|
CMDDIR=$TOPDIR/cmd
|
||||||
CMDDIR=$ZFSDIR/zcmd
|
MODDIR=$TOPDIR/module
|
||||||
UNAME=`uname -r | cut -d- -f1`
|
UNAME=`uname -r | cut -d- -f1`
|
||||||
|
|
||||||
AC_SUBST(UNAME)
|
AC_SUBST(UNAME)
|
||||||
AC_SUBST(TOPDIR)
|
AC_SUBST(TOPDIR)
|
||||||
AC_SUBST(BUILDDIR)
|
AC_SUBST(BUILDDIR)
|
||||||
AC_SUBST(ZFSDIR)
|
|
||||||
AC_SUBST(LIBDIR)
|
AC_SUBST(LIBDIR)
|
||||||
AC_SUBST(CMDDIR)
|
AC_SUBST(CMDDIR)
|
||||||
|
AC_SUBST(MODDIR)
|
||||||
AC_SUBST(UNAME)
|
AC_SUBST(UNAME)
|
||||||
|
|
||||||
AC_ARG_WITH([zfs-config],
|
AC_ARG_WITH([zfs-config],
|
||||||
|
|
Loading…
Reference in New Issue