X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=Makefile.am;h=17a6a26e7e25796ab1bed0839711d7d370a7839c;hb=ebe7e575eae1e03b1faa545a424f008faeac589d;hp=c6ed2009f29f5863a3716537739fb2b8169ba2b1;hpb=ae26d0465a234d7b340566287908c78fe24901e1;p=zfs.git diff --git a/Makefile.am b/Makefile.am index c6ed200..17a6a26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,10 @@ include $(top_srcdir)/config/rpm.am include $(top_srcdir)/config/deb.am include $(top_srcdir)/config/tgz.am +include $(top_srcdir)/config/arch.am if CONFIG_USER -USER_DIR = dracut etc man scripts lib cmd +USER_DIR = dracut udev etc man scripts lib cmd endif if CONFIG_KERNEL KERNEL_DIR = module @@ -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