Commit 9d02edc6 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Makefile: Allow tarball creation when man-in-doc is active



Documentation with included man pages should not be distributed as it
contains fixed paths. Since the documentation with man pages is actually
written to a separate directory, tarball creation is still possible.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarIustin Pop <iustin@google.com>
parent 82e3bf85
...@@ -1709,11 +1709,6 @@ dist-hook: ...@@ -1709,11 +1709,6 @@ dist-hook:
$(MAKE) $(AM_MAKEFLAGS) regen-vcs-version $(MAKE) $(AM_MAKEFLAGS) regen-vcs-version
rm -f $(top_distdir)/vcs-version rm -f $(top_distdir)/vcs-version
cp -p $(srcdir)/vcs-version $(top_distdir) cp -p $(srcdir)/vcs-version $(top_distdir)
if MANPAGES_IN_DOC
echo 'Building distribution with man pages included in documentation is' \
'not allowed as they can contain fixed paths' >&2; \
exit 1
endif
# a distcheck hook rule for catching revision control directories # a distcheck hook rule for catching revision control directories
distcheck-hook: distcheck-hook:
...@@ -1743,6 +1738,10 @@ distcheck-hook: ...@@ -1743,6 +1738,10 @@ distcheck-hook:
echo "Found unreleased version in NEWS." >&2; \ echo "Found unreleased version in NEWS." >&2; \
exit 1; \ exit 1; \
fi fi
if test -e $(top_distdir)/doc/man-html; then \
echo "Found documentation including man pages in final archive" >&2; \
exit 1; \
fi
# When building a release, stricter checks should be used # When building a release, stricter checks should be used
distcheck-release dist-release: export BUILD_RELEASE = 1 distcheck-release dist-release: export BUILD_RELEASE = 1
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment