[commit: ghc] master: Use Cabal to build mkUserGuidePart (a299f10)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/a299f108528ed4a8ba038a5c5e9a19768a0e44e0 >--------------------------------------------------------------- commit a299f108528ed4a8ba038a5c5e9a19768a0e44e0 Author: Ian Lynagh <[email protected]> Date: Wed Oct 24 01:31:20 2012 +0100 Use Cabal to build mkUserGuidePart >--------------------------------------------------------------- utils/mkUserGuidePart/ghc.mk | 7 ++----- .../mkUserGuidePart.cabal} | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/utils/mkUserGuidePart/ghc.mk b/utils/mkUserGuidePart/ghc.mk index 75371c3..98dc298 100644 --- a/utils/mkUserGuidePart/ghc.mk +++ b/utils/mkUserGuidePart/ghc.mk @@ -10,13 +10,10 @@ # # ----------------------------------------------------------------------------- -utils/mkUserGuidePart_dist_MODULES = Main +utils/mkUserGuidePart_USES_CABAL = YES +utils/mkUserGuidePart_PACKAGE = mkUserGuidePart utils/mkUserGuidePart_dist_PROG = mkUserGuidePart$(exeext) utils/mkUserGuidePart_dist_INSTALL_INPLACE = YES utils/mkUserGuidePart_dist_PROGRAM_WAY = v -utils/mkUserGuidePart_HC_OPTS = -package ghc - -utils/mkUserGuidePart/dist/build/Main.o: $(ALL_STAGE1_LIBS) -utils/mkUserGuidePart/dist/build/Main.o: $(compiler_stage2_v_LIB) $(eval $(call build-prog,utils/mkUserGuidePart,dist,1)) diff --git a/utils/ghc-pwd/ghc-pwd.cabal b/utils/mkUserGuidePart/mkUserGuidePart.cabal similarity index 68% copy from utils/ghc-pwd/ghc-pwd.cabal copy to utils/mkUserGuidePart/mkUserGuidePart.cabal index ba2eb63..3cadaac 100644 --- a/utils/ghc-pwd/ghc-pwd.cabal +++ b/utils/mkUserGuidePart/mkUserGuidePart.cabal @@ -1,4 +1,4 @@ -Name: ghc-pwd +Name: mkUserGuidePart Version: 0.1 Copyright: XXX License: BSD3 @@ -11,8 +11,8 @@ Description: build-type: Simple cabal-version: >=1.2 -Executable ghc-pwd - Main-Is: ghc-pwd.hs +Executable mkUserGuidePart + Main-Is: Main.hs Build-Depends: base >= 3 && < 5, - directory >= 1 && < 1.3 + ghc