diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-06-29 11:00:03 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-06-29 11:00:03 +0000 |
| commit | e47ddd4edb7e57b5a93a5fdd00ce18809010ee33 (patch) | |
| tree | ea00838474f9df8e8ace66d2d2b980bf0154406e | |
| parent | b95f3f4a43d0fc7d45227b3eec8999132e5694a1 (diff) | |
| download | haskell-e47ddd4edb7e57b5a93a5fdd00ce18809010ee33.tar.gz | |
Rename cabal to cabal-bin
Avoids conflicts with the Cabal library on case-insensitive filesystems
| -rw-r--r-- | .darcs-boring | 2 | ||||
| -rw-r--r-- | libraries/Makefile | 22 | ||||
| -rw-r--r-- | libraries/cabal-bin.hs (renamed from libraries/cabal.hs) | 0 |
3 files changed, 12 insertions, 12 deletions
diff --git a/.darcs-boring b/.darcs-boring index 4d36d30fee..fdbae8f32d 100644 --- a/.darcs-boring +++ b/.darcs-boring @@ -81,7 +81,7 @@ # Other library bits that get generated: ^libraries/bootstrapping/ ^libraries/stamp/ -^libraries/cabal$ +^libraries/cabal-bin$ ^libraries/ifBuildable(/|$) ^libraries/installPackage(/|$) ^libraries/index.html diff --git a/libraries/Makefile b/libraries/Makefile index a258ca3cac..aa64155f7b 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -159,12 +159,12 @@ subdirs: .PHONY: boot -boot: ifBuildable/ifBuildable cabal ghc-prim/Setup +boot: ifBuildable/ifBuildable cabal-bin ghc-prim/Setup HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries IFBUILDABLE=ifBuildable/ifBuildable $(HERE_ABS)/boot-packages -CABAL=$(HERE_ABS)/cabal +CABAL=$(HERE_ABS)/cabal-bin CABAL_GHC_FLAGS = -Wall ifeq "$(ghc_ge_605)" "NO" @@ -175,13 +175,13 @@ BOOTSTRAPPING_FLAGS = $(CABAL_GHC_FLAGS) -DCABAL_VERSION=1,3 -odir $(HERE_ABS)/b # We use -main-is so that GHC doesn't get confused and think # Main.hi/Main.o from cabal belongs to ghc-prim/Setup, or vice-versa. -cabal: cabal.hs - $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal -o cabal -main-is Cabal +cabal-bin: cabal-bin.hs + $(GHC) $(BOOTSTRAPPING_FLAGS) --make cabal-bin -o cabal-bin -main-is Cabal -# ghc-prim/Setup doesn't really depend on cabal, but pretending that it +# ghc-prim/Setup doesn't really depend on cabal-bin, but pretending that it # does sequentialises building the two of them, which is nice given # they're sharing -odir and -hidir. -ghc-prim/Setup: ghc-prim/Setup.hs cabal +ghc-prim/Setup: ghc-prim/Setup.hs cabal-bin cd ghc-prim && $(GHC) $(BOOTSTRAPPING_FLAGS) --make Setup -o Setup installPackage/installPackage: installPackage.hs @@ -271,7 +271,7 @@ ALL_CONFIGURE_FLAGS = \ $(foreach SUBDIR,$(SUBDIRS), \ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \ -stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal +stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal-bin -$(RM) -f stamp/configure.library.*.$* $*/unbuildable $(MKDIRHIER) `dirname $@` ( cd $* && $(CABAL) configure $(ALL_CONFIGURE_FLAGS) ) \ @@ -290,7 +290,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: cabal # make.*, so filter them out and use an alternate rule below instead. $(foreach SUBDIR,$(filter-out $(SUBDIRS_BUILD),$(SUBDIRS)),make.library.$(SUBDIR)):\ make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal ifBuildable/ifBuildable + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ cmp -s $(MAKEFILE_LOCAL) Makefile.local || cp $(MAKEFILE_LOCAL) .; \ @@ -310,7 +310,7 @@ make.library.%: build.library.% # Build the library using 'setup build' (not the default) $(foreach SUBDIR,$(SUBDIRS),build.library.$(SUBDIR)):\ build.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal ifBuildable/ifBuildable + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ $(CABAL) build $(addprefix --ghc-option=,$(GhcLibHcOpts)); \ @@ -331,7 +331,7 @@ endif $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\ doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \ - cabal ifBuildable/ifBuildable + cabal-bin ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && $(CABAL) haddock --html-location='../$$pkg' \ $(CABAL_HADDOCK_FLAGS); \ @@ -348,7 +348,7 @@ distclean: clean clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)) $(RM) -rf bootstrapping/* - $(RM) -f cabal + $(RM) -f cabal-bin $(RM) -rf ifBuildable $(RM) -rf installPackage $(RM) -f libraries.txt index.html doc-index.html doc-index*.html diff --git a/libraries/cabal.hs b/libraries/cabal-bin.hs index 85341c299d..85341c299d 100644 --- a/libraries/cabal.hs +++ b/libraries/cabal-bin.hs |