Add -p switch to "zpool get"

[zfs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ca8a419..9c299a9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,21 +1,28 @@
+
+ACLOCAL_AMFLAGS = -I config
+
 include $(top_srcdir)/config/rpm.am
 include $(top_srcdir)/config/deb.am
 include $(top_srcdir)/config/tgz.am
 
-SUBDIRS = include
+SUBDIRS = include rpm
 if CONFIG_USER
 SUBDIRS += dracut udev etc man scripts lib cmd
 endif
 if CONFIG_KERNEL
 SUBDIRS += module
+
+extradir = /usr/src/zfs-$(VERSION)
+extra_HEADERS = zfs.release.in zfs_config.h.in
+
+kerneldir = /usr/src/zfs-$(VERSION)/$(LINUX_VERSION)
+nodist_kernel_HEADERS = zfs.release zfs_config.h module/$(LINUX_SYMBOLS)
 endif
 
 AUTOMAKE_OPTIONS = foreign
-EXTRA_DIST  = autogen.sh zfs.spec.in zfs-modules.spec.in
+EXTRA_DIST  = autogen.sh copy-builtin
 EXTRA_DIST += config/config.awk config/rpm.am config/deb.am config/tgz.am
 EXTRA_DIST += META DISCLAIMER COPYRIGHT README.markdown OPENSOLARIS.LICENSE
-EXTRA_DIST += dkms.postinst copy-builtin
-noinst_HEADERS = zfs_config.h zfs.release
 
 distclean-local::
        -$(RM) -R autom4te*.cache
@@ -29,14 +36,9 @@ distclean-local::
                -o -name '*.order' -o -name '*.markers' \) \
                -type f -print | xargs $(RM)
 
-if CONFIG_KERNEL
-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) -m 644 -D $$instfile $$instdest/$$instfile; \
-       done
-endif
+dist-hook:
+       sed -i 's/Release:[[:print:]]*/Release:      $(RELEASE)/' \
+               $(distdir)/META
 
 ctags:
        $(RM) $(top_srcdir)/tags
@@ -49,5 +51,5 @@ etags:
 tags: ctags etags
 
 pkg: @DEFAULT_PACKAGE@
-pkg-modules: @DEFAULT_PACKAGE@-modules
+pkg-kmod: @DEFAULT_PACKAGE@-kmod
 pkg-utils: @DEFAULT_PACKAGE@-utils