From: Thibault Godouet <fcron@free.fr>
Date: Wed, 19 Dec 2012 17:57:34 +0000 (+0000)
Subject: ensure the documentation is generated by "make all" rather than waiting for make... 
X-Git-Tag: ver3_1_0~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc730cb2bc9d40fd2a1e2ccf5258334b8ae91dd2;p=fcron

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

diff --git a/Makefile.in b/Makefile.in
index cd78d28..fb3ece8 100644
--- 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 f118bb1..bd053c7 100644
--- 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)" \