Prefix META_ALIAS with ZFS_
This commit is contained in:
parent
cb9c044bf6
commit
dbceaca71d
|
@ -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
|
||||||
|
|
|
@ -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]);
|
||||||
|
|
Loading…
Reference in New Issue