rpms/ghc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix haddock paths

Browse Source
This commit is contained in:
Bryan O'Sullivan 2008-01-07 22:57:23 +00:00
parent 7728a76fc5
commit d59db7372a
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ghc.spec
View File

@ -18,7 +18,7 @@
Name: ghc Name: ghc
Version: 6.8.2 Version: 6.8.2
Release: 2%{?dist} Release: 3%{?dist}
Summary: Glasgow Haskell Compilation system Summary: Glasgow Haskell Compilation system
# See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713 # See https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=239713
ExcludeArch: alpha ppc64 ExcludeArch: alpha ppc64
@ -113,14 +113,24 @@ echo "GhcRTSWays=thr debug" >> mk/build.mk
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
--datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \ --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} \
--libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \ --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} \
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
--docdir=%{_docdir}/%{name}-%{version} \
--htmldir=%{_docdir}/%{name}-%{version}
cat <<'HADDOCK_PATH_HACK' >> mk/build.mk
docdir := %{_docdir}/%{name}-%{version}
htmldir := $(docdir)
dvidir := $(docdir)
pdfdir := $(docdir)
psdir := $(docdir)
HADDOCK_PATH_HACK
# drop truncated copy of header (#222865) # drop truncated copy of header (#222865)
rm libraries/network/include/Typeable.h rm libraries/network/include/Typeable.h
make %{_smp_mflags} docdir=%{_docdir}/%{name}-%{version} all make %{_smp_mflags} all
%if %{build_doc} %if %{build_doc}
make %{_smp_mflags} docdir=%{_docdir}/%{name}-%{version} html make %{_smp_mflags} html
make %{_smp_mflags} -C libraries HADDOCK_DOCS=YES make %{_smp_mflags} -C libraries HADDOCK_DOCS=YES
( cd libraries/Cabal && docbook2html doc/Cabal.xml --output doc/Cabal ) ( cd libraries/Cabal && docbook2html doc/Cabal.xml --output doc/Cabal )
%endif %endif
@ -131,10 +141,7 @@ rm -rf $RPM_BUILD_ROOT
make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/%{name}-%{version} install make DESTDIR=${RPM_BUILD_ROOT} libdir=%{_libdir}/%{name}-%{version} install
%if %{build_doc} %if %{build_doc}
make DESTDIR=${RPM_BUILD_ROOT} docdir=%{_docdir}/%{name}-%{version} \ make DESTDIR=${RPM_BUILD_ROOT} XMLDocWays="html" HADDOCK_DOCS=YES install-docs
XMLDocWays="html" HADDOCK_DOCS=YES install-docs
mv ${RPM_BUILD_ROOT}/%{_docdir}/%{name}/libraries \
${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}
cp libraries/*.html ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/libraries cp libraries/*.html ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/libraries
%endif %endif
@ -221,12 +228,18 @@ fi
%changelog %changelog
* Mon Jan 07 2008 Bryan O'Sullivan <bos@serpentine.com> - 6.8.2-3
- Fix haddock installation paths
* Tue Dec 12 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.2-1 * Tue Dec 12 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.2-1
- Update to 6.8.2 - Update to 6.8.2
* Fri Nov 23 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.1-2 * Fri Nov 23 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.1-2
- Exclude alpha - Exclude alpha
* Thu Nov 8 2007 Bryan O'Sullivan <bos@serpentine.com> - 6.8.1-2
- Drop bit-rotted attempts at making package relocatable
* Sun Nov 4 2007 Michel Salim <michel.sylvan@gmail.com> - 6.8.1-1 * Sun Nov 4 2007 Michel Salim <michel.sylvan@gmail.com> - 6.8.1-1
- Update to 6.8.1 - Update to 6.8.1