Don't bomb "make doc" when "make all" hasn't been run. [RT #16636]

diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 6103c576494c6dbda52ace834f43ed2017a0cae0..63248cf28d73c8679dfab42b6a07b8d1807938ca 100644 (file)
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -13,7 +13,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.1.2.1 2004/03/09 06:10:40 marka Exp $
+# $Id: Makefile.in,v 1.1.2.2 2007/01/30 07:47:27 sra Exp $
 
 srcdir =       @srcdir@
 VPATH =                @srcdir@
@@ -30,7 +30,18 @@ doc man:: ${MANOBJS}
 docclean manclean maintainer-clean::
        rm -f options
 
-options: 
-       ../../bin/tests/cfg_test --named --grammar | \
-               ${PERL} ${srcdir}/format-options.pl >options || \
-               rm -f options
+# Do not make options depend on ../../bin/tests/cfg_test, doing so
+# will cause excessively clever versions of make to attempt to build
+# that program right here, right now, if it is missing, which will
+# cause make doc to bomb.
+
+CFG_TEST = ../../bin/tests/cfg_test
+
+options: FORCE
+       if test -x ${CFG_TEST} && \
+          ${CFG_TEST} --named --grammar | \
+          ${PERL} ${srcdir}/format-options.pl >$@.new ; then \
+               mv -f $@.new $@ ; \
+       else \
+               rm -f $@.new ; \
+       fi