summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2008-11-26 13:28:44 -0800
committerBrian Behlendorf <[email protected]>2008-11-26 13:28:44 -0800
commitdbceaca71db4d7989acdef950ae23d4c92a55b67 (patch)
tree26c766d00fcf060947cedb8d07783bb379398653
parentcb9c044bf698cc063b986baa7f25cfcf4c76f54e (diff)
Prefix META_ALIAS with ZFS_
-rw-r--r--config/zfs-build.m42
-rw-r--r--config/zfs-meta.m410
2 files changed, 6 insertions, 6 deletions
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]);