* Makefile.am (doc): Do not use make's `-C' option. --- ChangeLog | 6 ++++++ Makefile.am | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05a0d4f..bbbd398 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-04-16 Roland Levillain <roland@lrde.epita.fr> + Have Makefile.am be more portable. + + * Makefile.am (doc): Do not use make's `-C' option. + +2009-04-16 Roland Levillain <roland@lrde.epita.fr> + Fix messages in m4/freeimageplus.m4. * m4/freeimageplus.m4: s/FreeImage/FreeImagePlus/g. diff --git a/Makefile.am b/Makefile.am index ef05249..6e5120f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,10 +4,11 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = build-aux external milena -.PHONY: doc -doc: - $(MAKE) -C milena doc - if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA + +# Shortcut to generate the documentation from the top level. +.PHONY: doc +doc: + cd milena && $(MAKE) $(AM_MAKEFLAGS) $@ -- 1.6.1.2