* Some adjustments for distcheck

Makefile.am

-SUBDIRS = support tools projects src resources projects-distrib examples @DOC_DIR@
+SUBDIRS = support tools projects src resources projects-distrib examples doc
 
 AUTOMAKE_OPTIONS = no-dependencies
 ACLOCAL_AMFLAGS = -I support

configure.ac

@@ -379,18 +379,18 @@ AC_SUBST(CYGPATH_U)
 
 AC_CHECK_PROGS(TEXI2HTML, texi2html)
 
-DOC_DIR=
+DOC_TARGETS=
 DOC_FLAG=
 
 AC_ARG_ENABLE(doc,
 [  --enable-doc            Build documentation [default=no]],
 [if [[ "$enableval" = "yes" ]]; then
-        DOC_DIR=doc
+        DOC_TARGETS=docs
         DOC_FLAG=--enable-doc
 fi],
 [])
 
-AC_SUBST(DOC_DIR)
+AC_SUBST(DOC_TARGETS)
 AC_SUBST(DOC_FLAG)
 
 ##########################################

doc/Makefile.am

+SUBDIRS=real
+
 GUIDE=ocarina
 
 man_MANS = ocarina-config.1 ocarina.1
@@ -7,12 +9,13 @@ GUIDE_RSTFILES = $(srcdir)/about.rst $(srcdir)/gfdl.rst			\
 	$(srcdir)/python.rst $(srcdir)/editors.rst			\
 	$(srcdir)/installation.rst $(srcdir)/usage.rst
 
-EXTRA_DIST= $(srcdir)/CODING_GUIDELINES $(srcdir)/CONTRIBUTING		\
-	$(srcdir)/PROBLEM-REPORT-FORM $(GUIDE_TEXIFILES) $(ALL_IMAGES)	\
-	$(man_MANS) $(srcdir)/ocarina-config.html			\
-	$(srcdir)/ocarina_man.html
+EXTRA_DIST= $(srcdir)/PROBLEM-REPORT-FORM $(GUIDE_TEXIFILES)	\
+	$(ALL_IMAGES) $(man_MANS) $(srcdir)/ocarina-config.html	\
+	 $(srcdir)/ocarina_man.html
+
+docs=$(GUIDE).html $(GUIDE).pdf
 
-all-local: $(GUIDE).html $(GUIDE).pdf
+all-local: @DOC_TARGETS@
 
 $(GUIDE).html: $(GUIDE_RSTFILES)
 	make  html

doc/real/Makefile.am

@@ -13,7 +13,9 @@ export TEXINPUTS:=$(texinputs)
 bibinputs:=$(srcdir):$(BIBINPUTS)
 export BIBINPUTS:=$(bibinputs)
 
-all-local: $(LATEX_FILE).tex biblio.bib $(REAL_CODE)
+all-local:
+
+build: $(LATEX_FILE).tex biblio.bib $(REAL_CODE)
 	latex $(srcdir)/$(LATEX_FILE).tex ;
 	bibtex $(LATEX_FILE) ;
 	latex $(srcdir)/$(LATEX_FILE).tex ;
@@ -34,7 +36,7 @@ distclean-local: clean
 
 install-data-local: all
 	$(INSTALL) -d $(DESTDIR)$(datadir)/doc/ocarina
-	$(INSTALL_DATA) $(LATEX_FILE).pdf $(DESTDIR)$(datadir)/doc/ocarina
+	-$(INSTALL_DATA) $(LATEX_FILE).pdf $(DESTDIR)$(datadir)/doc/ocarina
 
 EXTRA_DIST= $(srcdir)/sources2/range_set.real				\
 $(srcdir)/sources2/evaluation.real $(srcdir)/sources2/data.aadl		\