diff options
| author | Clemens Fruhwirth <clemens@endorphin.org> | 2007-12-27 14:31:14 +0000 |
|---|---|---|
| committer | Clemens Fruhwirth <clemens@endorphin.org> | 2007-12-27 14:31:14 +0000 |
| commit | 1286d3e9d7c0ce82cf3451983139902b70fce7b5 (patch) | |
| tree | 24e9f6647644fd922b0f25e0c13b5055e7a831a2 /libraries/Makefile | |
| parent | 98c68a1c5b63aadf9c7917274519d95bbe9394d4 (diff) | |
| download | haskell-1286d3e9d7c0ce82cf3451983139902b70fce7b5.tar.gz | |
API changes for cabal-HEAD
Rename interfacedir to haddockdir
Change empty(Copy|Register)Flags to default(Copy|Register)Flags
Wrap content of RegisterFlags with toFlag (the Flag type is actually just Maybe)
Diffstat (limited to 'libraries/Makefile')
| -rw-r--r-- | libraries/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 51cb7aadcb..57c9adf3ab 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -96,7 +96,7 @@ ilibdir = $$topdir ilibexecdir = $$topdir idatadir = $$topdir idocdir = $$topdir/doc/libraries/$$pkg -iinterfacedir = $$topdir/doc/libraries/$$pkg +ihaddockdir = $$topdir/doc/libraries/$$pkg ihtmldir = $$httptopdir/doc/libraries/$$pkg html_installed_root = $(prefix)/doc/libraries else @@ -108,7 +108,7 @@ ilibdir = $(libdir) ilibexecdir = $(libexecdir) idatadir = $(datadir) idocdir = $(docdir)/libraries/$$pkg -iinterfacedir = $(htmldir)/libraries/$$pkg +ihaddockdir = $(htmldir)/libraries/$$pkg ihtmldir = $(htmldir)/libraries/$$pkg html_installed_root = $(htmldir)/libraries endif @@ -250,7 +250,7 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup --libexecdir=/NONEXISTANT \ --datadir=/NONEXISTANT \ --docdir=/NONEXISTANT \ - --interfacedir=/NONEXISTANT \ + --haddockdir=/NONEXISTANT \ --htmldir=/NONEXISTANT \ --with-compiler=../../compiler/stage1/ghc-inplace \ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace \ @@ -372,7 +372,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: installPackage/installPackage ifBuildable/ifBuildable if ifBuildable/ifBuildable $*; then \ cd $* && \ - ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \ + ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% |