X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.spec.in;h=a24cb554ad58cc28dfebe8cfda0498225d093de8;hp=6133f36af6248d99ac995c689ca76105c87fdfa3;hb=fbb3eef5ee8f6f901ed6149b246c3bdbf8bd34fd;hpb=6a5d62b68d7abb2a675d5b7044bf6d9dc7cf2ebc

diff --git a/ghc.spec.in b/ghc.spec.in
index 6133f36..a24cb55 100644
--- a/ghc.spec.in
+++ b/ghc.spec.in
@@ -84,7 +84,7 @@ 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 )
@@ -92,9 +92,8 @@ make -C docs/ext-core ps
 make -C docs/storage-mgt ps
 
 %install
-make prefix=${RPM_BUILD_ROOT}%{_prefix} install
+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
-make datadir=`pwd` mandir=${RPM_BUILD_ROOT}%{_mandir} install-docs
 
 # generate the file list for lib/ _excluding_ all files needed for profiling
 # only
@@ -150,9 +149,7 @@ fi
 %doc docs/storage-mgt/rp.ps
 %doc docs/storage-mgt/sm.ps
 %doc docs/users_guide/users_guide
-%doc docs/index.html
 %doc libraries/Cabal/doc/Cabal
-%{_datadir}/ghc
 %{_mandir}/man1/ghc.1*
 %{_prefix}/bin/ghc
 %{_prefix}/bin/ghc-%{version}