From 3566d5c7c3cb415a53218251fc0247da55dfde46 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 17 Jan 2014 11:21:48 -0800 Subject: [PATCH] Remove incorrect use of EXTRA_DIST for man pages Setting the 'dist_' prefix is the correct way to instruct Automake to include these files in the distribution. The EXTRA_DIST variable is reserved for files which are not covered by the automatic rules. http://www.gnu.org/software/automake/manual/automake.html#Basics Signed-off-by: Brian Behlendorf --- man/man1/Makefile.am | 4 ++-- man/man5/Makefile.am | 3 +-- man/man8/Makefile.am | 4 +--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/man/man1/Makefile.am b/man/man1/Makefile.am index 476aeed54..113cd0d80 100644 --- a/man/man1/Makefile.am +++ b/man/man1/Makefile.am @@ -1,5 +1,5 @@ -man_MANS = zhack.1 zpios.1 ztest.1 -EXTRA_DIST = $(man_MANS) cstyle.1 +dist_man_MANS = zhack.1 zpios.1 ztest.1 +EXTRA_DIST = cstyle.1 install-data-local: $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man1" diff --git a/man/man5/Makefile.am b/man/man5/Makefile.am index bf1b3d1de..fcb73f4a0 100644 --- a/man/man5/Makefile.am +++ b/man/man5/Makefile.am @@ -1,5 +1,4 @@ -man_MANS = vdev_id.conf.5 zpool-features.5 zfs-module-parameters.5 -EXTRA_DIST = $(man_MANS) +dist_man_MANS = vdev_id.conf.5 zpool-features.5 zfs-module-parameters.5 install-data-local: $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man5" diff --git a/man/man8/Makefile.am b/man/man8/Makefile.am index be7bc1dd6..f68082221 100644 --- a/man/man8/Makefile.am +++ b/man/man8/Makefile.am @@ -1,4 +1,4 @@ -man_MANS = \ +dist_man_MANS = \ fsck.zfs.8 \ mount.zfs.8 \ vdev_id.8 \ @@ -8,7 +8,5 @@ man_MANS = \ zpool.8 \ zstreamdump.8 -EXTRA_DIST = $(man_MANS) - install-data-local: $(INSTALL) -d -m 0755 "$(DESTDIR)$(mandir)/man8"