projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the cgi package from extralibs
[ghc-hetmet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
e2f24a2
..
edad014
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-88,10
+88,10
@@
endif
# Sanity check that all the boot libraries are in the tree, to catch
# failure to run darcs-all.
check-packages :
# Sanity check that all the boot libraries are in the tree, to catch
# failure to run darcs-all.
check-packages :
- @ds=`cat libraries/boot-packages`;\
+ @ds=`grep "^[^# ][^ ]* *[^ ][^ ]*$$" packages | sed "s/ .*//"`;\
for d in $$ds; do \
for d in $$ds; do \
- if test ! -d libraries/$$d; then \
- echo "Looks like you're missing libraries/$$d,"; \
+ if test ! -d $$d; then \
+ echo "Looks like you're missing $$d,"; \
echo "maybe you haven't done './darcs-all get'?"; \
exit 1; \
fi \
echo "maybe you haven't done './darcs-all get'?"; \
exit 1; \
fi \
@@
-148,6
+148,9
@@
stage1 : $(GCC_LIB_DEP) check-all
stage2 : check-all
$(MAKE) -C compiler stage=2 boot
$(MAKE) -C compiler stage=2
stage2 : check-all
$(MAKE) -C compiler stage=2 boot
$(MAKE) -C compiler stage=2
+ifeq "$(HADDOCK_DOCS)" "YES"
+ $(MAKE) -C compiler stage=2 doc
+endif
$(MAKE) -C ghc stage=2 boot
$(MAKE) -C ghc stage=2
$(MAKE) -C ghc stage=2 boot
$(MAKE) -C ghc stage=2
@@
-176,13
+179,13
@@
all :: stamp.inplace-gcc-lib
# tree somewhere, and then have install copy it from there rather than
# from the filesystem.
stamp.inplace-gcc-lib:
# tree somewhere, and then have install copy it from there rather than
# from the filesystem.
stamp.inplace-gcc-lib:
- $(RM) -r compiler/gcc-lib
- mkdir compiler/gcc-lib
- cp $(LD) compiler/gcc-lib
+ $(RM) -r ghc/gcc-lib
+ mkdir ghc/gcc-lib
+ cp $(LD) ghc/gcc-lib
touch $@
clean ::
touch $@
clean ::
- $(RM) -r compiler/gcc-lib
+ $(RM) -r ghc/gcc-lib
$(RM) -f inplace-gcc-lib
endif
endif
$(RM) -f inplace-gcc-lib
endif
endif