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

Merge commit 'refs/top-bases/gcc-uninit' into gcc-uninit

This commit is contained in:
Brian Behlendorf 2008-11-26 13:31:22 -08:00
parent 8ccaee0f9e dbceaca71d
commit ee1b66545a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/zfs-build.m4
View File

@ -17,7 +17,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
. ./config/$zfsconfig . ./config/$zfsconfig
TOPDIR=`/bin/pwd` TOPDIR=`/bin/pwd`
BUILDDIR=$META_NAME #+$zfsconfig BUILDDIR=$ZFS_META_NAME #+$zfsconfig
ZFSDIR=$TOPDIR/$BUILDDIR ZFSDIR=$TOPDIR/$BUILDDIR
LIBDIR=$ZFSDIR/lib LIBDIR=$ZFSDIR/lib
CMDDIR=$ZFSDIR/zcmd CMDDIR=$ZFSDIR/zcmd

10
config/zfs-meta.m4
View File

@ -38,14 +38,14 @@ AC_DEFUN([ZFS_AC_META], [
fi fi
if test -n "$ZFS_META_NAME" -a -n "$ZFS_META_VERSION"; then if test -n "$ZFS_META_NAME" -a -n "$ZFS_META_VERSION"; then
META_ALIAS="$ZFS_META_NAME-$ZFS_META_VERSION" ZFS_META_ALIAS="$ZFS_META_NAME-$ZFS_META_VERSION"
test -n "$ZFS_META_RELEASE" && test -n "$ZFS_META_RELEASE" &&
META_ALIAS="$META_ALIAS-$ZFS_META_RELEASE" ZFS_META_ALIAS="$ZFS_META_ALIAS-$ZFS_META_RELEASE"
AC_DEFINE_UNQUOTED([META_ALIAS], AC_DEFINE_UNQUOTED([ZFS_META_ALIAS],
["$META_ALIAS"], ["$ZFS_META_ALIAS"],
[Define the project alias string.] [Define the project alias string.]
) )
AC_SUBST([META_ALIAS]) AC_SUBST([ZFS_META_ALIAS])
fi fi
ZFS_META_DATA=_ZFS_AC_META_GETVAL([DATE]); ZFS_META_DATA=_ZFS_AC_META_GETVAL([DATE]);