Switch KM_SLEEP to KM_PUSHPAGE

[zfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3689d1f..9ffd6be 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,23 @@
 include $(top_srcdir)/config/rpm.am
-include ${top_srcdir}/config/deb.am
-include ${top_srcdir}/config/tgz.am
+include $(top_srcdir)/config/deb.am
+include $(top_srcdir)/config/tgz.am
+include $(top_srcdir)/config/arch.am
 
 if CONFIG_USER
-USER_DIR = config etc man scripts lib cmd
+USER_DIR = dracut udev etc man scripts lib cmd
 endif
 if CONFIG_KERNEL
 KERNEL_DIR = module
 endif
-SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
+SUBDIRS = $(USER_DIR) $(KERNEL_DIR) include
 
-AUTOMAKE_OPTIONS = foreign dist-zip
+AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST  = autogen.sh zfs.spec.in zfs-modules.spec.in
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
-EXTRA_DIST += META DISCLAIMER COPYRIGHT GIT README.markdown
+EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown
 EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
-
-noinst_HEADERS = zfs_config.h
+EXTRA_DIST += dkms.postinst copy-builtin
+noinst_HEADERS = zfs_config.h zfs.release
 
 distclean-local::
        -$(RM) -R autom4te*.cache
@@ -24,18 +25,16 @@ distclean-local::
                -o -name .pc -o -name .hg -o -name .git \) -prune -o \
                \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
                -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
-               -o -name '.*.rej' -o -name 'aclocal.m4' -o -size 0 \
+               -o -name '.*.rej' -o -name '.script-config' -o -size 0 \
                -o -name '*%' -o -name '.*.cmd' -o -name 'core' \
                -o -name 'Makefile' -o -name 'Module.symvers' \
-               -o -name '*.order' -o -name '*.markers' \
-               -o -name '.script-config' \) \
+               -o -name '*.order' -o -name '*.markers' \) \
                -type f -print | xargs $(RM)
 
 if CONFIG_KERNEL
 install-data-local:
-       destname=zfs-$(ZFS_META_VERSION)/$(LINUX_VERSION); \
-       instdest=$(DESTDIR)/usr/src/$$destname; \
-       echo "${ZFS_META_VERSION}" >$$instdest/zfs.release; \
+       release=$(ZFS_META_VERSION)-$(ZFS_META_RELEASE); \
+       instdest=$(DESTDIR)/usr/src/zfs-$$release/$(LINUX_VERSION); \
        for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
                $(INSTALL) -D $$instfile $$instdest/$$instfile; \
        done