ensure the documentation is generated by "make all" rather than waiting for make...

diff --git a/Makefile.in b/Makefile.in
index cd78d28fa49920400846619579d0441305dda971..fb3ece80ee597b7f52f04b62824389ac18e17b36 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,7 +95,7 @@ else
 endif
 
 ifeq ($(FCRONDYN), 1)
-all: fcron fcrontab fcrondyn convert-fcrontab files/fcron.conf initscripts
+all: fcron fcrontab fcrondyn convert-fcrontab files/fcron.conf initscripts doc
 else
 all: fcron fcrontab convert-fcrontab files/fcron.conf
 endif
@@ -134,6 +134,9 @@ initscripts:
                        $(SRCDIR)/script/gen-in.pl $(SRCDIR)/script/$${F}.in script/$${F} ./ ; \
                done)
 
+doc:
+       $(MAKE) -C doc doc-if-none
+
 install: install-staged strip perms 
 ifeq ($(BOOTINSTALL), 1)
        $(SRCDIR)/script/boot-install "$(INSTALL) -o $(ROOTNAME)" $(DESTSBIN) $(DEBUG) $(FCRONTABS) $(ANSWERALL) $(SRCDIR)

diff --git a/doc/Makefile.in b/doc/Makefile.in
index f118bb13cc9fac134fd86f4d2d837f02c65fd97a..bd053c77c8cd4b667299756cb2c3b169b5b677f9 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -52,7 +52,7 @@ doc:
                test -d $(SRCDIR)/$$i/HTML || mkdir $(SRCDIR)/$$i/HTML ; \
                test -d $(SRCDIR)/$$i/txt || mkdir $(SRCDIR)/$$i/txt ; \
                test -d $(SRCDIR)/$$i/man || mkdir $(SRCDIR)/$$i/man ; \
-               make $(SRCDIR)/$$i/HTML/index.html $(SRCDIR)/$$i/txt/readme.txt \
+               $(MAKE) $(SRCDIR)/$$i/HTML/index.html $(SRCDIR)/$$i/txt/readme.txt \
                        $(SRCDIR)/$$i/man/fcron.8 ; \
        done)
 
@@ -67,9 +67,9 @@ doc-if-none:
 # succeed after the first time "make doc" is called
        @(for i in $(LANGUAGES); \
        do \
-               test -f $(SRCDIR)/$$i/HTML/index.html || make doc ; \
-               test -f $(SRCDIR)/$$i/txt/readme.txt || make doc ; \
-               test -f $(SRCDIR)/$$i/man/fcron.8 || make doc ; \
+               test -f $(SRCDIR)/$$i/HTML/index.html || $(MAKE) doc ; \
+               test -f $(SRCDIR)/$$i/txt/readme.txt || $(MAKE) doc ; \
+               test -f $(SRCDIR)/$$i/man/fcron.8 || $(MAKE) doc ; \
        done)
 
 # man/fcron.8 means in fact "build *all* the man pages"
@@ -225,7 +225,7 @@ vclean: clean
        rm -f Makefile ${STYLESHEET}
 
 ci: clean
-# we run a "cd .." because it makes appear the path of the file ( ./doc/XXXX )
+# we run a "cd .." because it makes the path of the file appear ( ./doc/XXXX )
 # during the ci-ing
 # the symbolic links verX_X_X has been created since version 2.9.4
        @(cd ..; find ./doc/ -type f ! -regex '.*RCS.*' ! -regex "$(RCSNOCI)" \