Fix building with GHC 6.8

[ghc-hetmet.git] / Makefile

diff --git a/Makefile b/Makefile
index 80f8b3f..7a16c71 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -152,6 +152,7 @@ stage2 : check-all
        $(MAKE) -C compiler stage=2 boot
        $(MAKE) -C compiler stage=2
        $(MAKE) -C utils with-stage-2
+       $(MAKE) -C libraries stage=2 all
 ifeq "$(HADDOCK_DOCS)" "YES"
        $(MAKE) -C libraries doc
        $(MAKE) -C compiler  doc stage=2
@@ -209,6 +210,8 @@ install-strip:
 
 # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
 install :: check-packages
+       $(MKDIRHIER) $(DESTDIR)$(datadir)
+       echo "[]" > $(DESTDIR)$(datadir)/package.conf
        @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
        for i in $(SUBDIRS); do \
          echo "------------------------------------------------------------------------"; \