X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.spec.in;h=a24cb554ad58cc28dfebe8cfda0498225d093de8;hp=850169cd0b925e24f874082b4cf8a86b4f27e4ff;hb=45202530612593a0ba7a6c559a38dc1ff26670a4;hpb=d2fdf91ce20bc64a4d486df8d195b6b05b000db9

diff --git a/ghc.spec.in b/ghc.spec.in
index 850169c..a24cb55 100644
--- a/ghc.spec.in
+++ b/ghc.spec.in
@@ -84,14 +84,16 @@ needed.
 %build
 test -f configure || sh boot
 ./configure --prefix=%{_prefix} --mandir=%{_mandir}
-make %{?jobs:-j%jobs} HTML_DIR_INSTALLED=%{_defaultdocdir}/%{name}/libraries/'$(PACKAGE)'
+make %{?jobs:-j%jobs} docdir=%{_datadir}/doc/packages/%{name}
 make html
+make -C libraries doc
+( 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
+make DESTDIR=${RPM_BUILD_ROOT} docdir=%{_datadir}/doc/packages/%{name} install install-docs
+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,7 +149,6 @@ 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
 %{_mandir}/man1/ghc.1*
 %{_prefix}/bin/ghc
@@ -159,7 +160,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