[packages/alex] - ghc has been taught to use ld.bfd, no need for hackery here - fixed doc install

baggins baggins at pld-linux.org
Fri May 31 21:02:31 CEST 2013


commit 1cfeffab4e256db790f98bdfb92e06239b96b8c4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri May 31 21:01:22 2013 +0200

    - ghc has been taught to use ld.bfd, no need for hackery here
    - fixed doc install

 alex.spec | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/alex.spec b/alex.spec
index 3b7f69c..b10254b 100644
--- a/alex.spec
+++ b/alex.spec
@@ -36,14 +36,7 @@ regularnych. Jest podobne do narzędzi lex lub flex dla C/C++.
 %prep
 %setup -q
 
-# ghc relies on ld.bfd specific options
-mkdir -p ld-dir
-if [ -x /usr/bin/ld.bfd ]; then
-	ln -sf /usr/bin/ld.bfd ld-dir/ld
-fi
-
 %build
-PATH=$(pwd)/ld-dir:$PATH
 %{?with_bootstrap:PATH=$PATH:/usr/local/bin}
 runhaskell Setup.lhs configure --prefix=%{_prefix}
 runhaskell Setup.lhs build
@@ -62,6 +55,11 @@ runhaskell Setup.lhs copy --destdir=$RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 cp -a examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
+# work around automatic haddock docs installation
+%{__rm} -rf %{name}-%{version}-doc
+cp -a $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} %{name}-%{version}-doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/alex.git/commitdiff/1cfeffab4e256db790f98bdfb92e06239b96b8c4



More information about the pld-cvs-commit mailing list