Retire ZFS.RELEASE file

[zfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89e094e..ca8a419 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,20 @@
 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 udev 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
-EXTRA_DIST += dkms.postinst
+EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE
+EXTRA_DIST += dkms.postinst copy-builtin
 noinst_HEADERS = zfs_config.h zfs.release
 
 distclean-local::
@@ -36,7 +34,7 @@ install-data-local:
        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; \
+               $(INSTALL) -m 644 -D $$instfile $$instdest/$$instfile; \
        done
 endif