X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc.spec.in;h=a03a759fc4f466f13bad6d853ace8b8d49d4eaf4;hp=7e30dbb61e35c957b35bd64bab67c2509f6a6c71;hb=06435c511c76ba7d084af3c9420614e167f4a9e5;hpb=7a1d53cf93ac4c354402846fe4a94dfe5fc71114

diff --git a/ghc.spec.in b/ghc.spec.in
index 7e30dbb..a03a759 100644
--- a/ghc.spec.in
+++ b/ghc.spec.in
@@ -2,7 +2,7 @@
 #
 # Copyright [1998..2004] The GHC Team
 #
-# Thanks to Zoltan Vorosbaranyi <vbzoli@vbzo.li> for suggestions in 
+# Thanks to Zoltan Vorosbaranyi <vbzoli@vbzo.li> for suggestions in
 # earlier versions and Pixel <pixel@mandrakesoft.com> for coding tips.
 #
 # This file is subject to the same free software license as GHC.
@@ -17,10 +17,10 @@ Release:        %{release}
 License:        BSD-like
 Group:          Development/Languages/Haskell
 URL:            http://haskell.org/ghc/
-Source:         http://haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source0:        http://haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz2
+Source1:        http://haskell.org/ghc/dist/%{version}/ghc-%{version}-src-extralibs.tar.bz2
 Packager:       Sven Panne <sven.panne@aedion.de>
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Prefix:         %{_prefix}
 Requires:       gmp, readline
 BuildRequires:  alex >= 2.0, happy >= 1.15, ghc >= 5, haddock, docbook-dtd, docbook-xsl-stylesheets, libxslt, libxml2, fop, xmltex, dvips, gmp, readline-devel, mesaglut-devel
 Provides:       haskell
@@ -78,19 +78,19 @@ Profiling libraries for Glorious Glasgow Haskell Compilation System
 needed.
 
 %prep
-%setup
+%setup -b1
 
 %build
 test -f configure || autoreconf
-./configure --prefix=%{prefix}
-make
+./configure --prefix=%{_prefix} --mandir=%{_mandir}
+make HTML_DIR_INSTALLED=%{_defaultdocdir}/%{name}/libraries/'$(PACKAGE)'
 make html
 make -C docs/ext-core ps
 make -C docs/storage-mgt ps
- 
+
 %install
-make prefix=${RPM_BUILD_ROOT}%{prefix} install
-make datadir=`pwd` install-docs
+make prefix=${RPM_BUILD_ROOT}%{_prefix} install
+make datadir=`pwd` mandir=${RPM_BUILD_ROOT}%{_mandir} install-docs
 
 # generate the file list for lib/ _excluding_ all files needed for profiling
 # only
@@ -98,14 +98,14 @@ make datadir=`pwd` install-docs
 # * generating file lists in a BUILD_ROOT spec is a bit tricky: the file list
 #   has to contain complete paths, _but_ without the BUILD_ROOT, we also do
 #   _not_ want have directory names in the list; furthermore, we have to make
-#   sure that any leading / is removed from %{prefix}/lib, as find has to 
+#   sure that any leading / is removed from %{_prefix}/lib, as find has to
 #   interpret the argument as a relative path; however, we have to include the
 #   leading / again in the final file list (otherwise, rpm complains)
 # * isn't there an easier way to do all this?
 #
 dir=`pwd`
 cd ${RPM_BUILD_ROOT}
-libdir=`echo %{prefix}/lib | sed 's|^/||'`
+libdir=`echo %{_prefix}/lib | sed 's|^/||'`
 find $libdir ! -type d !  -name '*.p_hi' !   -name '*_p.a'    -print | sed 's|^|/|' > $dir/rpm-noprof-lib-files
 find $libdir ! -type d \( -name '*.p_hi' -or -name '*_p.a' \) -print | sed 's|^|/|' > $dir/rpm-prof-lib-files
 cd $dir
@@ -119,27 +119,27 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc ANNOUNCE
 %doc LICENSE
 %doc README
-%doc docs/building/building
+%doc docs/comm
 %doc docs/ext-core/core.ps
 %doc docs/storage-mgt/ldv.ps
 %doc docs/storage-mgt/rp.ps
 %doc docs/storage-mgt/sm.ps
 %doc docs/users_guide/users_guide
-%doc hslibs/doc/hslibs
 %doc html/*
 %doc libraries/Cabal/doc/Cabal
-%{prefix}/bin/ghc
-%{prefix}/bin/ghc-%{version}
-%{prefix}/bin/ghc-pkg
-%{prefix}/bin/ghc-pkg-%{version}
-%{prefix}/bin/ghci
-%{prefix}/bin/ghci-%{version}
-%{prefix}/bin/ghcprof
-%{prefix}/bin/hasktags
-%{prefix}/bin/hp2ps
-%{prefix}/bin/hsc2hs
-%{prefix}/bin/runghc
-%{prefix}/bin/runhaskell
+%{_mandir}/man1/ghc.1*
+%{_prefix}/bin/ghc
+%{_prefix}/bin/ghc-%{version}
+%{_prefix}/bin/ghc-pkg
+%{_prefix}/bin/ghc-pkg-%{version}
+%{_prefix}/bin/ghci
+%{_prefix}/bin/ghci-%{version}
+%{_prefix}/bin/ghcprof
+%{_prefix}/bin/hasktags
+%{_prefix}/bin/hp2ps
+%{_prefix}/bin/hsc2hs
+%{_prefix}/bin/runghc
+%{_prefix}/bin/runhaskell
 
 %files prof -f rpm-prof-lib-files
 %defattr(-,root,root)