Prevent `make distclean` removing config/config.rpath

[mirror_zfs.git] / config / zfs-meta.m4

diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4
index 7c92dd541e49e23bdef1b42a0bbd62fa9c0ea0c4..aa0fc1420933b31446891d6a12b3068c00c2dad7 100644 (file)
--- a/config/zfs-meta.m4
+++ b/config/zfs-meta.m4
@@ -60,9 +60,12 @@ AC_DEFUN([ZFS_AC_META], [
 
                ZFS_META_VERSION=_ZFS_AC_META_GETVAL([Version]);
                if test -n "$ZFS_META_VERSION"; then
-                       AC_DEFINE_UNQUOTED([ZFS_META_VERSION], ["$ZFS_META_VERSION"],
-                               [Define the project version.]
-                       )
+                       AC_DEFINE_UNQUOTED([ZFS_META_VERSION],
+                           ["$ZFS_META_VERSION"],
+                           [Define the project version.])
+                       AC_DEFINE_UNQUOTED([SPL_META_VERSION],
+                           [ZFS_META_VERSION],
+                           [Defined for legacy compatibility.])
                        AC_SUBST([ZFS_META_VERSION])
                fi
 
@@ -74,13 +77,24 @@ AC_DEFUN([ZFS_AC_META], [
                        if test -n "${_release}"; then
                                ZFS_META_RELEASE=${_release}
                                _zfs_ac_meta_type="git describe"
+                       else
+                               _match="${ZFS_META_NAME}-${ZFS_META_VERSION}-${ZFS_META_RELEASE}"
+                               _alias=$(git describe --match=${_match} 2>/dev/null)
+                               _release=$(echo ${_alias}|cut -f3- -d'-'|sed 's/-/_/g')
+                               if test -n "${_release}"; then
+                                       ZFS_META_RELEASE=${_release}
+                                       _zfs_ac_meta_type="git describe"
+                               fi
                        fi
                fi
 
                if test -n "$ZFS_META_RELEASE"; then
-                       AC_DEFINE_UNQUOTED([ZFS_META_RELEASE], ["$ZFS_META_RELEASE"],
-                               [Define the project release.]
-                       )
+                       AC_DEFINE_UNQUOTED([ZFS_META_RELEASE],
+                            ["$ZFS_META_RELEASE"],
+                            [Define the project release.])
+                       AC_DEFINE_UNQUOTED([SPL_META_RELEASE],
+                           [ZFS_META_RELEASE],
+                           [Defined for legacy compatibility.])
                        AC_SUBST([ZFS_META_RELEASE])
 
                        RELEASE="$ZFS_META_RELEASE"
@@ -100,9 +114,11 @@ AC_DEFUN([ZFS_AC_META], [
                                test -n "$ZFS_META_RELEASE" && 
                                        ZFS_META_ALIAS="$ZFS_META_ALIAS-$ZFS_META_RELEASE"
                                AC_DEFINE_UNQUOTED([ZFS_META_ALIAS],
-                                       ["$ZFS_META_ALIAS"],
-                                       [Define the project alias string.] 
-                               )
+                                   ["$ZFS_META_ALIAS"],
+                                   [Define the project alias string.])
+                               AC_DEFINE_UNQUOTED([SPL_META_ALIAS],
+                                   [ZFS_META_ALIAS],
+                                   [Defined for legacy compatibility.])
                                AC_SUBST([ZFS_META_ALIAS])
                fi