From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Wed, 26 Nov 2008 21:28:44 +0000 (-0800)
Subject: Prefix META_ALIAS with ZFS_
X-Git-Tag: zfs-0.5.1~131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dbceaca71db4d7989acdef950ae23d4c92a55b67;p=zfs

Prefix META_ALIAS with ZFS_
---

diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
index aba0be6a7..484ce8dd3 100644
--- 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 bbe1f9ba0..7ec44a3fc 100644
--- 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]);