Remove remaining bits of bindist "make in-place"

[ghc-hetmet.git] / distrib / Makefile

diff --git a/distrib/Makefile b/distrib/Makefile
index 2b6cdca..06c1f29 100644 (file)
--- a/distrib/Makefile
+++ b/distrib/Makefile
@@ -1,25 +1,35 @@
 
 include Makefile-vars
 
-.PHONY: in-place mk-version-symlinks install-dirs install
-
-in-place ::
-       @if test -x "./post-inplace-script" ; then \
-               echo "Running project-specific post-inplace script ..." ; \
-               ./post-inplace-script $(platform) `pwd` \
-                       $(package)-$(version); \
-               echo "Done" ; \
-       fi
-       @echo "Finished configuring..to use, add `pwd`/bin/$(platform) to your PATH."
-
-install-dirs ::
+.PHONY: mk-version-symlinks install
+
+#.PHONY: in-place
+# This has bitrotted:
+#in-place ::
+#      @if test -x "./post-inplace-script" ; then \
+#              echo "Running project-specific post-inplace script ..." ; \
+#              ./post-inplace-script $(platform) `pwd` \
+#                      $(package)-$(version); \
+#              echo "Done" ; \
+#      fi
+#      @echo "Finished configuring..to use, add `pwd`/bin/$(platform) to your PATH."
+
+install ::
        $(INSTALL_DIR) $(bindir)
-       (cd lib/$(platform); find . -type d -exec sh -c '$(INSTALL_DIR) $$0 $(libdir)/$$0' {} \; )
        (cd share; find . -type d -exec sh -c '$(INSTALL_DIR) $(datadir)/$$0' {} \; )
 
-install :: install-dirs install-driver install-utils install-libs install-datas install-docs postinstall denounce
+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 compiler  install DOING_BIN_DIST=YES
+       $(INSTALL_DATA) $(INSTALL_OPTS) extra-gcc-opts $(libdir)
+
+install :: install-docs postinstall denounce
 
-.PHONY: install-libs install-utils install-datas postinstall denounce
+.PHONY: postinstall denounce
 
 denounce:
        @echo
@@ -44,21 +54,6 @@ postinstall:
                echo "Done" ; \
        fi
 
-install-libs:
-       (cd lib/$(platform); find . -type f -exec sh -c '$(CP) $$0 $(libdir)/$$0' {} \; )
-       $(MAKE) -C libraries install DOING_BIN_DIST=YES
-
-install-driver:
-       $(MAKE) -C driver install DOING_BIN_DIST=YES
-
-install-utils:
-       $(MAKE) -C utils install DOING_BIN_DIST=YES
-
-install-datas:
-       set -e; for i in `(cd share; find . -type f )`; do \
-          $(INSTALL_DATA) share/$$i $(datadir)/$$i; \
-       done
-
 show-install-setup:
        @echo "Install setup..."
        @echo "bindir  = $(bindir)"