From 156fa3d16dcffb44898af0b939dd8798b59cf54f Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Sun, 23 May 2010 10:37:22 +0000
Subject: [PATCH]   * ./goodies:     - Bug: In coriolis2.spec.in, split the
 build in two steps so the documentation         can be installed in the right
 docdir.

---
 bootstrap/coriolis2.spec.in | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in
index 5e02af30..da332d66 100644
--- a/bootstrap/coriolis2.spec.in
+++ b/bootstrap/coriolis2.spec.in
@@ -64,7 +64,7 @@ Development files for the Coriolis 2 package.
  VLSISAPD_TOP=%{coriolisTop}; export VLSISAPD_TOP
  CORIOLIS_TOP=%{coriolisTop}; export CORIOLIS_TOP
 
-# Do build & install in one step.
+# Do build & install in one step, except for docs.
  tools="vlsisapd hurricane crlcore knik katabatic kite equinox solstice unicorn"
  for tool in $tools; do
    %__mkdir_p build/$tool
@@ -78,11 +78,19 @@ Development files for the Coriolis 2 package.
          -D LIB_SUFFIX:STRING=64                       \
 %endif
          ../../$tool
+   make DESTDIR=%{buildroot} %{_smp_mflags} install
+   popd
+ done
+
+# Second step: docs.
+ docTools="crlcore"
+ for tool in $docTools; do
+   pushd build/$tool;
    makeArgs=""
    if [ "$tool" = "crlcore" ]; then
      makeArgs="dvi safepdf"
    fi
-   make DESTDIR=%{buildroot} %{_smp_mflags} ${makeArgs} install
+   make DESTDIR=%{buildroot} %{_smp_mflags} ${makeArgs}
    popd
  done
 
@@ -117,7 +125,8 @@ Development files for the Coriolis 2 package.
 
 %files
 %defattr(-,root,root,-)
-%doc %{_docdir}/coriolis2/README.*
+#%doc %{_docdir}/coriolis2/README.*
+%doc build/crlcore/doc/README.{tex,dvi,pdf}
 %dir %{_sysconfdir}/coriolis2
 %dir %{coriolisTop}/share/coriolis2/flute-2.4
 %dir %{coriolisTop}/bin