projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't check that we have found haddock
[ghc-hetmet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
471ac1a
..
02d43d9
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-74,16
+74,7
@@
endif
SUBDIRS = gmp libffi includes utils driver docs rts compiler ghc libraries libraries/Cabal/doc
SUBDIRS = gmp libffi includes utils driver docs rts compiler ghc libraries libraries/Cabal/doc
-check-all: check-tools check-packages
-
-check-tools:
- @:
-ifeq "$(HADDOCK_DOCS)" "YES"
-ifeq "$(HADDOCK)" ""
- echo "Couldn't find haddock" >&2
- exit 1
-endif
-endif
+check-all: check-packages
# Sanity check that all the boot libraries are in the tree, to catch
# failure to run darcs-all.
# Sanity check that all the boot libraries are in the tree, to catch
# failure to run darcs-all.
@@
-284,7
+275,7
@@
install-docs ::
binary-dist::
-rm -rf $(BIN_DIST_DIR)
binary-dist::
-rm -rf $(BIN_DIST_DIR)
- -$(RM) $(BIN_DIST_TARBALL)
+ -$(RM) $(BIN_DIST_TAR_BZ2)
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@@
-304,8
+295,8
@@
binary-dist :: tar-binary-dist
.PHONY: tar-binary-dist
tar-binary-dist:
.PHONY: tar-binary-dist
tar-binary-dist:
- ( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TARBALL) )
- ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TARBALL) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
+ ( cd $(BIN_DIST_TOPDIR_ABS); tar cf - $(BIN_DIST_NAME) | bzip2 > $(BIN_DIST_TAR_BZ2) )
+ ( cd $(BIN_DIST_TOPDIR_ABS); bunzip2 -c $(BIN_DIST_TAR_BZ2) | tar tf - | sed "s/^ghc-$(ProjectVersion)/fptools/" | sort >$(FPTOOLS_TOP_ABS)/bin-manifest-$(ProjectVersion) )
else
else
@@
-405,7
+396,7
@@
endif
tar tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion)
endif
tar tf $(BIN_DIST_TAR) | sort > bin-manifest-$(ProjectVersion)
endif
-PUBLISH_FILES = $(BIN_DIST_TARBALL)
+PUBLISH_FILES = $(BIN_DIST_TAR_BZ2)
# Upload the distribution and documentation
ifneq "$(ISCC)" ""
# Upload the distribution and documentation
ifneq "$(ISCC)" ""