jhbuild r1850 - in trunk: . doc

[fpeters svn gnome org]

Author: fpeters
Date: Sat Jan 19 00:52:38 2008
New Revision: 1850
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1850&view=rev

Log:
* Makefile.am, doc/Makefile.am: totally ignore the doc/ directory
unless --enable-doc-installation is passed to configure.
(closes: #510516)



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/doc/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Jan 19 00:52:38 2008
@@ -1,4 +1,6 @@
+if DOC_INSTALLATION_ENABLED
 SUBDIRS = doc
+endif
 
 PATCHES = $(wildcard $(top_srcdir)/patches/*.patch)
 SOURCES = $(shell find $(top_srcdir)/jhbuild/ -name *.py) jhbuild/defaults.jhbuildrc

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	(original)
+++ trunk/doc/Makefile.am	Sat Jan 19 00:52:38 2008
@@ -1,9 +1,8 @@
 DOC_LINGUAS = 
 
 include $(top_srcdir)/gnome-doc-utils.make
+
 dist-hook: doc-dist-hook
 
-if DOC_INSTALLATION_ENABLED
 DOC_MODULE = jhbuild
 DOC_FIGURES = figures/jhbuild_sample_dot_output.png
-endif