Fix Trac #2467: decent warnings for orphan instances

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 2b6fcb9..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 :
-       @ds=`cat libraries/boot-packages`;\
+       @ds=`grep "^[^# ][^ ]*  *[^ ][^ ]*$$" packages | sed "s/ .*//"`;\
        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 \
@@ -179,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:
-       $(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 ::
-       $(RM) -r compiler/gcc-lib
+       $(RM) -r ghc/gcc-lib
        $(RM) -f inplace-gcc-lib
 endif
 endif