update submodules for GHC.HetMet.GArrow -> Control.GArrow renaming

[ghc-hetmet.git] / distrib / Makefile

diff --git a/distrib/Makefile b/distrib/Makefile
index 951ec7e..7f8add1 100644 (file)
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -19,32 +19,35 @@ install-strip:
 
 install ::
        $(INSTALL_DIR) $(bindir)
+       $(INSTALL_DIR) $(datadir)
+       echo "[]" > $(datadir)/package.conf
 
 install::
        $(MAKE) -C includes  install      DOING_BIN_DIST=YES
-       $(MAKE) -C driver    install      DOING_BIN_DIST=YES
        $(MAKE) -C utils     install      DOING_BIN_DIST=YES
        $(MAKE) -C rts       install      DOING_BIN_DIST=YES
        $(MAKE) -C libraries install      DOING_BIN_DIST=YES
+       $(MAKE) -C libffi    install      DOING_BIN_DIST=YES
        $(MAKE) -C compiler  install      DOING_BIN_DIST=YES
        $(MAKE) -C ghc       install      DOING_BIN_DIST=YES
+       $(MAKE) -C driver    install      DOING_BIN_DIST=YES
        $(MAKE) -C gmp       install      DOING_BIN_DIST=YES
        $(MAKE) -C docs      install-docs DOING_BIN_DIST=YES
        $(MAKE) -C libraries/Cabal/doc install-docs DOING_BIN_DIST=YES
-       $(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(libdir)
+       $(INSTALL_DATA) $(INSTALL_OPTS) settings $(libdir)
 
 install :: postinstall denounce
 
 # Look to see if $(bindir) is in $(PATH). Assumes there are no funky
 # characters.
-GREPPED_PATH=$(shell echo "$(PATH)" | grep "\(^\|:\)$(bindir)\(:\|$$\)")
+GREPPED_PATH=$(shell echo ":$(PATH):" | grep ":$(bindir):")
 
 denounce:
        @echo
        @echo =======================================================================
        @echo Installation of $(package)-$(version) was successful.
        @echo
-ifneq "$(GREPPED_PATH)" ""
+ifeq "$(GREPPED_PATH)" ""
        @echo To use, add $(bindir) to your PATH.
        @echo
 endif