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

diff --git a/ghc.spec.in b/ghc.spec.in
index ed7a00d..d5d87d0 100644
--- a/ghc.spec.in
+++ b/ghc.spec.in
@@ -82,16 +82,18 @@ 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)'
+make %{?jobs:-j%jobs}
 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} 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,8 +149,9 @@ fi
 %doc docs/storage-mgt/rp.ps
 %doc docs/storage-mgt/sm.ps
 %doc docs/users_guide/users_guide
-%doc html/*
+%doc docs/index.html
 %doc libraries/Cabal/doc/Cabal
+%{_datadir}/doc/ghc
 %{_mandir}/man1/ghc.1*
 %{_prefix}/bin/ghc
 %{_prefix}/bin/ghc-%{version}
@@ -159,7 +162,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