* ./goodies:

- Bug: In coriolis2.spec.in, just remove the installed doc then install them
        from build with the %doc directive.
This commit is contained in:
Jean-Paul Chaput 2010-05-23 10:57:01 +00:00
parent 156fa3d16d
commit e0a95da527
1 changed files with 4 additions and 10 deletions

View File

@ -64,7 +64,7 @@ Development files for the Coriolis 2 package.
VLSISAPD_TOP=%{coriolisTop}; export VLSISAPD_TOP VLSISAPD_TOP=%{coriolisTop}; export VLSISAPD_TOP
CORIOLIS_TOP=%{coriolisTop}; export CORIOLIS_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" tools="vlsisapd hurricane crlcore knik katabatic kite equinox solstice unicorn"
for tool in $tools; do for tool in $tools; do
%__mkdir_p build/$tool %__mkdir_p build/$tool
@ -78,22 +78,16 @@ Development files for the Coriolis 2 package.
-D LIB_SUFFIX:STRING=64 \ -D LIB_SUFFIX:STRING=64 \
%endif %endif
../../$tool ../../$tool
make DESTDIR=%{buildroot} %{_smp_mflags} install
popd
done
# Second step: docs.
docTools="crlcore"
for tool in $docTools; do
pushd build/$tool;
makeArgs="" makeArgs=""
if [ "$tool" = "crlcore" ]; then if [ "$tool" = "crlcore" ]; then
makeArgs="dvi safepdf" makeArgs="dvi safepdf"
fi fi
make DESTDIR=%{buildroot} %{_smp_mflags} ${makeArgs} make DESTDIR=%{buildroot} %{_smp_mflags} ${makeArgs} install
popd popd
done done
%__rm_f %{buildroot}%{coriolisTop}/share/doc/coriolis2
%install %install
# Nothing to do here. # Nothing to do here.