Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Resolve conflict

This commit is contained in:
Brian Behlendorf 2008-12-23 11:45:24 -08:00
parent d8c0d57440 7e10a5b195
commit 2bfda1a2a7
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
config/zfs-build.m4
View File

@ -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}
@ -223,17 +220,15 @@ 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 BUILDDIR=$TOPDIR
ZFSDIR=$TOPDIR/$BUILDDIR LIBDIR=$TOPDIR/lib
LIBDIR=$ZFSDIR/lib CMDDIR=$TOPDIR/cmd
CMDDIR=$ZFSDIR/cmd MODDIR=$TOPDIR/module
MODDIR=$ZFSDIR/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(MODDIR)