From e0a95da5277a8c5b79d8b4f9ef4c5ea609033e2c Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Sun, 23 May 2010 10:57:01 +0000
Subject: [PATCH]   * ./goodies:     - Bug: In coriolis2.spec.in, just remove
 the installed doc then install them         from build with the %doc
 directive.

---
 bootstrap/coriolis2.spec.in | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/bootstrap/coriolis2.spec.in b/bootstrap/coriolis2.spec.in
index da332d66..5297bf26 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, except for docs.
+# Do build & install in one step.
  tools="vlsisapd hurricane crlcore knik katabatic kite equinox solstice unicorn"
  for tool in $tools; do
    %__mkdir_p build/$tool
@@ -78,22 +78,16 @@ 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}
+   make DESTDIR=%{buildroot} %{_smp_mflags} ${makeArgs} install
    popd
  done
 
+ %__rm_f %{buildroot}%{coriolisTop}/share/doc/coriolis2
+
 
 %install
 # Nothing to do here.