diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-10 13:39:25 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-10 13:39:25 +0000 |
| commit | 6d0dd9aa562a9f96bf875b7260675609e1171b66 (patch) | |
| tree | 02fe46e0d6384d23b222bf77e63e38a69133a393 /libraries/Makefile | |
| parent | 2de31b61d0a963803eb5632c9659c6093d74f345 (diff) | |
| download | haskell-6d0dd9aa562a9f96bf875b7260675609e1171b66.tar.gz | |
bindist fixes
Diffstat (limited to 'libraries/Makefile')
| -rw-r--r-- | libraries/Makefile | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 6cc349b423..50cd5184c2 100644 --- a/libraries/Makefile +++ b/libraries/Makefile @@ -119,6 +119,8 @@ ihtmldir = $(htmldir)/libraries/$$pkg html_installed_root = $(htmldir)/libraries endif +IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages + ifneq "$(DOING_BIN_DIST)" "YES" CONFIGURE_OPTS = @@ -146,8 +148,6 @@ subdirs: HERE_ABS=$(FPTOOLS_TOP_ABS)/libraries -IFBUILDABLE=ifBuildable/ifBuildable $(FPTOOLS_TOP_ABS)/packages - CABAL_GHC_FLAGS = -Wall ifeq "$(ghc_ge_605)" "NO" CABAL_GHC_FLAGS += -cpp @@ -364,7 +364,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \ install.library.%: ifBuildable/ifBuildable if $(IFBUILDABLE) $*; then \ cd $* && \ - $(INSTALL_PACKAGE) install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ + $(INSTALL_PACKAGE) install '$(DESTDIR)$(bindir)/ghc-pkg' '$(DESTDIR)$(datadir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idynlibdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(ihaddockdir)' ; \ fi .PHONY: binary-dist binary-dist.library.% @@ -372,14 +372,16 @@ install.library.%: ifBuildable/ifBuildable BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries BINDIST_EXTRAS += ifBuildable/ifBuildable -ifeq "$(HADDOCK_DOCS)" "YES" -BINDIST_EXTRAS += gen_contents_index -BINDIST_EXTRAS += index.html -BINDIST_EXTRAS += doc-index*.html -endif binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)) -# This is a bit of a hack, but it works... echo $(WHERE_AM_I)/Makefile >> $(BIN_DIST_LIST) +# XXX This needs to be changed: This ifBuildable is built with the +# bootstrapping compiler, so isn't OS X friendly. It should be made into +# a Cabal package if we keep it. However, once we drop extralibs we can +# probably remove it anyway. + echo $(WHERE_AM_I)/ifBuildable/ifBuildable >> $(BIN_DIST_LIST) +ifeq "$(HADDOCK_DOCS)" "YES" + for FILE in gen_contents_index index.html doc-index*.html; do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done +endif $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \ binary-dist.library.%: |