build-sys: use dist_noinst_DATA to work around the bug with dist_man_MANS

Automake mishandles dist_man_MANS.  Using dist_noinst_DATA to work
around this is more elegant than using dist-hook.

Signed-off-by: Stepan Kasal <skasal@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index feb98d952fef7ff02be45c876b3db1c365b5e89d..1d964acba643b1ea6ea41cf360c9a0825e4b8ccb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,12 +39,3 @@ mrproper: distclean
                cd config; rm -f `cat ../.gitignore`; cd .. ; \
                cd po; rm -f `cat .gitignore`; cd .. ; \
        fi
-
-# The automake is very stupid for work with man pages. The files from man_MANS are
-# not included to the distribution. A solution is use dist_man_MANS or
-# EXTRA_DIST = $(man_MANS) -- but these solutions are ugly in case that there
-# is a lot of "if <cond>", because the result in EXTRA_DIST or dist_man_MANS
-# depends on the condition ;-(
-dist-hook:
-       -find -regex "\./[a-z\-]*/[a-z\.\-\_]*\.[1-9]" -exec cp {} $(distdir)/{} \;
-

diff --git a/config/include-Makefile.am b/config/include-Makefile.am
index 18f8474dc7c4fe660eefa2ca60349b6375339ebf..6e306556fe84925b3e269005a5d6431ffd6647aa 100644 (file)
--- a/config/include-Makefile.am
+++ b/config/include-Makefile.am
@@ -7,3 +7,9 @@ mandir = $(datadir)/man
 AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include \
        -DLOCALEDIR=\"$(localedir)\"
 AM_CFLAGS = -fsigned-char -fomit-frame-pointer
+
+# Automake (at least up to 1.10) mishandles dist_man_MANS inside conditionals.
+# Unlike with other dist primaries, the files are not distributed if the
+# conditional is false.
+# Work the bug around until it is fixed:
+dist_noinst_DATA = $(man_MANS)