diff options
| author | Krzesimir Nowak <qdlacz@gmail.com> | 2011-03-27 18:20:12 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2011-03-28 15:23:52 +0200 |
| commit | 7cc24030b988f503512d3177d5203b88a4abaa9f (patch) | |
| tree | 68c5950fa6762590c82738b510a36e85c8a3f167 /macros | |
| parent | 9ca8230a0cfdde8f9ce915fa6a21c28f4eb0bc7c (diff) | |
| download | mm-common-7cc24030b988f503512d3177d5203b88a4abaa9f.tar.gz | |
Distribute doctools if non-empty parameter is passed to MM_CONFIG_DOCTOOL_DIR.
* macros/mm-doc.m4:
* build/doc-reference.am: If non-empty parameter is passed to
MM_CONFIG_DOCTOOL_DIR then mm-common-prepare will copy doctools
to given directory. These files are needed during install stage,
so they need to be distributed. This way we don't need to add
some lines to Makefile.am in every project using mm-common. Which
we did, anyway.
Diffstat (limited to 'macros')
| -rw-r--r-- | macros/mm-doc.m4 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/macros/mm-doc.m4 b/macros/mm-doc.m4 index 5c105f3..1e89f7d 100644 --- a/macros/mm-doc.m4 +++ b/macros/mm-doc.m4 @@ -1,4 +1,4 @@ -## Copyright (c) 2009-2010 Openismus GmbH <http://www.openismus.com/> +## Copyright (c) 2009, 2010, 2011 Openismus GmbH <http://www.openismus.com/> ## ## This file is part of mm-common. ## @@ -15,7 +15,7 @@ ## You should have received a copy of the GNU General Public License ## along with mm-common. If not, see <http://www.gnu.org/licenses/>. -#serial 20100107 +#serial 20110327 ## _MM_CONFIG_DOCTOOL_DIR ## @@ -52,16 +52,15 @@ AC_MSG_RESULT([$MMDOCTOOLDIR])[]dnl ## the source tree. ## ## The directory name is used by mm-common-prepare as the destination -## for copying the required files into the source tree. If you make -## use of this feature in order to avoid a dependency on mm-common, make -## sure to include the installed files in the distribution tarball of -## your package. +## for copying the required files into the source tree. The files are not +## distributed if first parameter is empty. ## AC_DEFUN([MM_CONFIG_DOCTOOL_DIR], [dnl AC_REQUIRE([_MM_PRE_INIT])[]dnl AC_REQUIRE([MM_CHECK_GNU_MAKE])[]dnl m4_ifval([$1], [MMDOCTOOLDIR='[$]{top_srcdir}/$1'], [AC_REQUIRE([_MM_CONFIG_DOCTOOL_DIR])]) +AM_CONDITIONAL([DIST_DOCTOOLS], [test 'x$1' != 'x'])dnl AC_SUBST([MMDOCTOOLDIR])[]dnl ]) |