Prefix META_ALIAS with ZFS_

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index aba0be6a7e8adae5a437c5e9de3659282c46294d..484ce8dd30d1f17b1acd84c3651cb168f46dc0d6 100644 (file)
--- a/config/zfs-build.m4
+++ b/config/zfs-build.m4
@@ -17,7 +17,7 @@ AC_DEFUN([ZFS_AC_CONFIG], [
        . ./config/$zfsconfig
 
        TOPDIR=`/bin/pwd`
-       BUILDDIR=$META_NAME #+$zfsconfig
+       BUILDDIR=$ZFS_META_NAME #+$zfsconfig
        ZFSDIR=$TOPDIR/$BUILDDIR
        LIBDIR=$ZFSDIR/lib
        CMDDIR=$ZFSDIR/zcmd

diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
index bbe1f9ba0dd224ede13023de32340198544bb117..7ec44a3fc3871b406f73850a64bde8cea370b882 100644 (file)
--- a/config/zfs-meta.m4
+++ b/config/zfs-meta.m4
@@ -38,14 +38,14 @@ AC_DEFUN([ZFS_AC_META], [
                fi
 
                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" && 
-                                       META_ALIAS="$META_ALIAS-$ZFS_META_RELEASE"
-                               AC_DEFINE_UNQUOTED([META_ALIAS],
-                                       ["$META_ALIAS"],
+                                       ZFS_META_ALIAS="$ZFS_META_ALIAS-$ZFS_META_RELEASE"
+                               AC_DEFINE_UNQUOTED([ZFS_META_ALIAS],
+                                       ["$ZFS_META_ALIAS"],
                                        [Define the project alias string.] 
                                )
-                               AC_SUBST([META_ALIAS])
+                               AC_SUBST([ZFS_META_ALIAS])
                fi
 
                ZFS_META_DATA=_ZFS_AC_META_GETVAL([DATE]);