Illumos #3090 and #3102

[zfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c6ed200..833bee6 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/arch.am
 
+SUBDIRS = include
 if CONFIG_USER
-USER_DIR = dracut etc man scripts lib cmd
+SUBDIRS += dracut udev etc man scripts lib cmd
 endif
 if CONFIG_KERNEL
-KERNEL_DIR = module
+SUBDIRS += module
 endif
-SUBDIRS = $(USER_DIR) $(KERNEL_DIR) include
 
 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 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
@@ -32,9 +33,8 @@ distclean-local::
 
 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