X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=17a6a26e7e25796ab1bed0839711d7d370a7839c;hb=c7f2d69de397b02cc803f541dd2d405e0c284e76;hp=5a0791b44d6d471688d893ed5140690d529bfb0b;hpb=1ae93745d2eadcdfdf1ab677180f28922e7c7d26;p=zfs.git

diff --git a/Makefile.am b/Makefile.am
index 5a0791b..17a6a26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,17 @@
 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 README.markdown
@@ -32,9 +33,9 @@ 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); \
+	echo "$$release" >$$instdest/zfs.release; \
 	for instfile in $(noinst_HEADERS) module/$(LINUX_SYMBOLS); do \
 		$(INSTALL) -D $$instfile $$instdest/$$instfile; \
 	done