X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=2897ae941bdaf04eca86519fd4eb3ef769cff8aa;hb=0da31cd6ca0dedbf0ceb7118d2cede2e97e73c14;hp=5a03f1e3f5a15b50bfa30d62e1052340920007a8;hpb=6283f55ea1b91e680386388c17d14b89e344fa8d;p=zfs.git

diff --git a/Makefile.am b/Makefile.am
index 5a03f1e..2897ae9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,21 +2,21 @@ include $(top_srcdir)/config/rpm.am
 include $(top_srcdir)/config/deb.am
 include $(top_srcdir)/config/tgz.am
 
+SUBDIRS = include
 if CONFIG_USER
-USER_DIR = 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,11 +32,10 @@ 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; \
+		$(INSTALL) -m 644 -D $$instfile $$instdest/$$instfile; \
 	done
 endif