X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.spec.in;h=5d3fa1f1d1859285ff9c0d96a3170bda3c6e2f9b;hp=ed7a00d0190725d4d5de5915da4e22fb437586ef;hb=f5edc6b0871a0debbc9a64f4cdb95c0dc35e5b16;hpb=1ee08bbe86b03ba74a9be309a84602b34e41cbb4

diff --git a/ghc.spec.in b/ghc.spec.in
index ed7a00d..5d3fa1f 100644
--- a/ghc.spec.in
+++ b/ghc.spec.in
@@ -82,16 +82,33 @@ needed.
 %setup -b1
 
 %build
-test -f configure || autoreconf
+test -f configure || sh boot
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs} HTML_DIR_INSTALLED=%{_defaultdocdir}/%{name}/libraries/'$(PACKAGE)'
+
+# Don't install these tools, we'll use update-alternatives below.
+touch mk/build.mk
+echo "NO_INSTALL_RUNHASKELL=YES" >>mk/build.mk
+echo "NO_INSTALL_HSC2HS=YES" >>mk/build.mk
+
+make %{?jobs:-j%jobs}
 make html
+# Alas, we don't pass make options/arguments down to "libraries", so let's redo make here...
+make -C libraries HADDOCK_DOCS=YES
+( cd libraries/Cabal && docbook2html doc/Cabal.xml --output doc/Cabal )
 make -C docs/ext-core ps
 make -C docs/storage-mgt ps
 
 %install
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
-make datadir=`pwd` mandir=${RPM_BUILD_ROOT}%{_mandir} install-docs
+# This is a cruel hack: There seems to be no way to install the Haddock
+# documentation into the build directory, because DESTDIR is alway prepended.
+# Furthermore, rpm removes the target documentation directory before the doc
+# macros are processed. Therefore we have to copy things back into safety... :-P
+# The right thing would be being able to install directly into the build tree.
+make DESTDIR=${RPM_BUILD_ROOT} docdir=%{_datadir}/doc/packages/%{name} HADDOCK_DOCS=YES install install-docs
+mkdir html-docs
+cp -a ${RPM_BUILD_ROOT}%{_datadir}/doc/packages/%{name}/{index.html,libraries} html-docs
+# Use version-less hsc2hs out of the way, we use update-alternatives.
+mv ${RPM_BUILD_ROOT}%{_prefix}/bin/hsc2hs ${RPM_BUILD_ROOT}%{_prefix}/bin/hsc2hs-ghc
 
 # generate the file list for lib/ _excluding_ all files needed for profiling
 # only
@@ -147,8 +164,8 @@ fi
 %doc docs/storage-mgt/rp.ps
 %doc docs/storage-mgt/sm.ps
 %doc docs/users_guide/users_guide
-%doc html/*
 %doc libraries/Cabal/doc/Cabal
+%doc html-docs/*
 %{_mandir}/man1/ghc.1*
 %{_prefix}/bin/ghc
 %{_prefix}/bin/ghc-%{version}
@@ -159,7 +176,9 @@ fi
 %{_prefix}/bin/ghcprof
 %{_prefix}/bin/hasktags
 %{_prefix}/bin/hp2ps
+%{_prefix}/bin/hpc
 %{_prefix}/bin/hsc2hs-ghc
+%{_prefix}/bin/hsc2hs-%{version}
 %{_prefix}/bin/runghc
 
 %files prof -f rpm-prof-lib-files