Merge tag 'upstream/0.6.5.5'

[mirror_spl-debian.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f9cd5429794ac1b34af4fef61cad4497e3ab753a..efeb243cba692f6b5fc751de65259378fb81b512 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,14 +24,16 @@
 # with the SPL.  If not, see <http://www.gnu.org/licenses/>.
 ###############################################################################
 
-AC_INIT
+AC_INIT(m4_esyscmd(grep Name META | cut -d ':' -f 2 | tr -d ' \n'),
+       m4_esyscmd(grep Version META | cut -d ':' -f 2 | tr -d ' \n'))
 AC_LANG(C)
 SPL_AC_META
 AC_CONFIG_AUX_DIR([config])
+AC_CONFIG_MACRO_DIR([config])
 AC_CANONICAL_SYSTEM
 AM_MAINTAINER_MODE
-AM_SILENT_RULES
-AM_INIT_AUTOMAKE([$SPL_META_NAME], [$SPL_META_VERSION])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+AM_INIT_AUTOMAKE
 AC_CONFIG_HEADERS([spl_config.h], [
        (mv spl_config.h spl_config.h.tmp &&
        awk -f ${ac_srcdir}/config/config.awk spl_config.h.tmp >spl_config.h &&
@@ -49,6 +51,7 @@ AC_CONFIG_FILES([
        Makefile
        man/Makefile
        man/man1/Makefile
+       man/man5/Makefile
        lib/Makefile
        cmd/Makefile
        module/Makefile
@@ -67,10 +70,10 @@ AC_CONFIG_FILES([
        include/vm/Makefile
        scripts/Makefile
        rpm/Makefile
-       rpm/fedora/Makefile
-       rpm/fedora/spl.spec
-       rpm/fedora/spl-kmod.spec
-       rpm/fedora/spl-dkms.spec
+       rpm/redhat/Makefile
+       rpm/redhat/spl.spec
+       rpm/redhat/spl-kmod.spec
+       rpm/redhat/spl-dkms.spec
        rpm/generic/Makefile
        rpm/generic/spl.spec
        rpm/generic/spl-kmod.spec