From: Christian Geisert <chrisg@apache.org>
Date: Tue, 27 Sep 2005 13:16:59 +0000 (+0000)
Subject: Build should work without Forrest installed
X-Git-Tag: fop-0_90-alpha1~173
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e36a41a6f409983d08916dbd86db7b7b2083ff1b;p=xmlgraphics-fop.git

Build should work without Forrest installed


git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@291934 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/build.xml b/build.xml
index c7caf4650..c131f5b6c 100644
--- a/build.xml
+++ b/build.xml
@@ -188,7 +188,7 @@ list of possible build targets.
   <!-- Importing Apache Forrest for building the docs -->
   <property environment="env"/>
   <property name="forrest.home" value="${env.FORREST_HOME}"/>
-  <import file="${env.FORREST_HOME}/main/forrest.build.xml"/>
+  <import file="${env.FORREST_HOME}/main/forrest.build.xml" optional="true"/>
 
   <!-- =================================================================== -->
   <!-- Initialization target                                               -->
@@ -915,10 +915,13 @@ list of possible build targets.
   <!-- =================================================================== -->
   <!-- Creates the documentation                                           -->
   <!-- =================================================================== -->
-  <target name="docs" depends="site" description="Generates documentation">
+  <target name="docs" description="Generates documentation">
     <echo message="Building documentation with Forrest..."/>
     <echo message="Make sure that you have installed Apache Forrest and"/>
     <echo message="the FORREST_HOME environment variable is set (see http://forrest.apache.org/)"/>
+    <echo message="FORREST_HOME = ${forrest.home}"/>
+
+    <antcall target="site"/>
   </target>
   
   <!-- =================================================================== -->