diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | ghc.spec.in | 29 | ||||
| -rw-r--r-- | utils/hsc2hs/Makefile | 2 | ||||
| -rw-r--r-- | utils/runghc/Makefile | 14 |
4 files changed, 27 insertions, 21 deletions
@@ -206,7 +206,7 @@ install-docs :: # ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32" -BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs +BinDistShScripts = ghc-$(ProjectVersion) ghci-$(ProjectVersion) ghc-pkg-$(ProjectVersion) hsc2hs-ghc else BinDistShScripts = endif @@ -214,7 +214,6 @@ endif BinDistPrlScripts = ghcprof BinDistLibPrlScripts = ghc-asm ghc-split BinDistBins = hp2ps runghc -BinDistOptBins = runhaskell BinDistLinks = ghc ghci ghc-pkg BinDistLibSplicedFiles = package.conf BinDistDirs = includes compiler docs driver libraries rts utils diff --git a/ghc.spec.in b/ghc.spec.in index c50e8052c4..ed7a00d019 100644 --- a/ghc.spec.in +++ b/ghc.spec.in @@ -1,6 +1,6 @@ # RPM spec file for GHC -*-rpm-spec-*- # -# Copyright [1998..2004] The GHC Team +# Copyright [1998..2007] The GHC Team # # Thanks to Zoltan Vorosbaranyi <vbzoli@vbzo.li> for suggestions in # earlier versions and Pixel <pixel@mandrakesoft.com> for coding tips. @@ -21,8 +21,9 @@ Source0: http://haskell.org/ghc/dist/%{version}/ghc-%{version}-src.tar.bz 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 +PreReq: update-alternatives 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 +BuildRequires: update-alternatives, 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 Summary: The Glasgow Haskell Compiler @@ -113,6 +114,27 @@ cd $dir %clean rm -rf ${RPM_BUILD_ROOT} +%post +# Alas, GHC, Hugs and nhc all come with different set of tools in addition to +# a runFOO: +# +# * GHC: hsc2hs +# * Hugs: hsc2hs, cpphs +# * nhc: cpphs +# +# Therefore it is currently not possible to use --slave below to form link +# groups under a single name 'runhaskell'. Either these tools should be +# disentangled from the Haskell implementations or all implementations should +# have the same set of tools. *sigh* +update-alternatives --install %{_bindir}/runhaskell runhaskell %{_bindir}/runghc 500 +update-alternatives --install %{_bindir}/hsc2hs hsc2hs %{_bindir}/hsc2hs-ghc 500 + +%preun +if test "$1" = 0; then + update-alternatives --remove runhaskell %{_bindir}/runghc + update-alternatives --remove hsc2hs %{_bindir}/hsc2hs-ghc +fi + %files -f rpm-noprof-lib-files %defattr(-,root,root) %doc docs/docbook-cheat-sheet/docbook-cheat-sheet @@ -137,9 +159,8 @@ rm -rf ${RPM_BUILD_ROOT} %{_prefix}/bin/ghcprof %{_prefix}/bin/hasktags %{_prefix}/bin/hp2ps -%{_prefix}/bin/hsc2hs +%{_prefix}/bin/hsc2hs-ghc %{_prefix}/bin/runghc -%{_prefix}/bin/runhaskell %files prof -f rpm-prof-lib-files %defattr(-,root,root) diff --git a/utils/hsc2hs/Makefile b/utils/hsc2hs/Makefile index 7c34bbaf14..88f3edbe85 100644 --- a/utils/hsc2hs/Makefile +++ b/utils/hsc2hs/Makefile @@ -33,7 +33,7 @@ endif SRC_HC_OPTS += -Wall ifneq "$(HOSTPLATFORM)" "i386-unknown-mingw32" -INSTALLED_SCRIPT_PROG = hsc2hs +INSTALLED_SCRIPT_PROG = hsc2hs-ghc endif INPLACE_SCRIPT_PROG = hsc2hs-inplace diff --git a/utils/runghc/Makefile b/utils/runghc/Makefile index c1a94c799a..f210b004f3 100644 --- a/utils/runghc/Makefile +++ b/utils/runghc/Makefile @@ -15,18 +15,4 @@ include $(GHC_COMPAT_DIR)/compat.mk # we must also build with $(GhcHcOpts) here: SRC_HC_OPTS += $(GhcHcOpts) $(GhcStage1HcOpts) -all :: runhaskell - -runhaskell : $(HS_PROG) - $(CP) $< runhaskell$(exeext) - -CLEAN_FILES += runhaskell - -# Only install runhaskell if there isn't already one installed -ifneq "$(findstring install, $(MAKECMDGOALS))" "" -ifeq "$(wildcard $(bindir)/runhaskell)" "" -INSTALL_PROGS += runhaskell$(exeext) -endif -endif - include $(TOP)/mk/target.mk |