[project @ 1997-03-24 06:51:48 by sof]

Ignore errors when making bin-distrib docs

diff --git a/Makefile b/Makefile
index 204d5ec..71f9f31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,32 +36,105 @@ BIN_DIST_TOP= distrib/Makefile-bin.in \
              distrib/configure-bin.in \
              distrib/README \
              distrib/INSTALL \
-             distrib/ANNOUNCE
+             distrib/ANNOUNCE \
+             distrib/PATCHLEVEL \
+             glafp-utils/mkdirhier/mkdirhier \
+             ghc/RELEASE \
+             install-sh \
+             config.guess \
+             config.sub
 
 binary-dist::
        @for i in $(BIN_DIST_TOP); do \
-         @echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
-         cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+         echo cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
+         cp $$i $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); \
        done;
+       @echo "hackily rename some of these chaps.."
+       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/Makefile.in 
+       $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure-bin.in $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/configure.in 
+       @echo "Generating a shippable configure script.."
+       -(cd $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME); autoconf )
 
 #
 # Creating and copying the documentation into the bin-dist tree.
+# (this tries to be oh-so-general about copyng docs, but isn't really
+# suited for anything else than ghc/)
+#
+# Needless to say, the rule below could be cleaned up somewhat.
 #
 binary-dist::
-       $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html
-       $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi
-       $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info
+       @$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02
+       @$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02
+       @$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02
        @echo "Making html documentation.."
+       @echo "For fptools.."
        $(MAKE) -C docs --no-print-directory $(MFLAGS) html
-       cp docs/html/* $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html
+       cp -f docs/html/* docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02
+       @echo "Done."
+       @for i in $(BIN_DIST_DIRS); do \
+          echo "For $$i.."; \
+          echo cp -f $$i/docs/users_guide/html/* $$i/docs/users_guide/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
+          cp -f $$i/docs/users_guide/html/* $$i/docs/users_guide/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
+          echo cp -f $$i/docs/html/* $$i/docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
+          cp -f $$i/docs/html/* $$i/docs/*.html $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/html/ghc-2.02; \
+          echo "Done."; \
+       done
        @echo "Making dvi files.."
-       $(MAKE) -C docs --no-print-directory $(MFLAGS) dvi
-       cp docs/*.dvi  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi
+       @echo "For fptools.."
+       -$(MAKE) -C docs --no-print-directory $(MFLAGS) dvi
+       -cp -f docs/*.dvi  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02
+       @echo "Done."
+       @for i in $(BIN_DIST_DIRS); do \
+          echo "For $$i.."; \
+          echo cp -f $$i/docs/users_guide/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
+          cp -f $$i/docs/users_guide/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
+          echo cp -f $$i/docs/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
+          cp -f $$i/docs/*.dvi $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/dvi/ghc-2.02; \
+          echo "Done."; \
+       done
        @echo "Making info files.."
-       $(MAKE) -C docs --no-print-directory $(MFLAGS) info
-       cp docs/*.info* $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info
+       @echo "For fptools.."
+       -$(MAKE) -C docs --no-print-directory $(MFLAGS) info
+       -cp -f docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02/
+       @echo "Done."
+       @for i in $(BIN_DIST_DIRS); do \
+          echo "For $$i docs.."; \
+          echo cp -f $$i/docs/users_guide/*.info  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
+          cp -f $$i/docs/users_guide/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
+          echo cp -f $$i/docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
+          cp -f $$i/docs/*.info $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/info/ghc-2.02; \
+          echo "Done."; \
+       done
+
+#
+# binary dist'ing hslibs/, hackily.
+#
+binary-dist ::
+       @echo $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs;
+       @$(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs;
+       $(MAKE) -C hslibs $(MFLAGS) install \
+               BIN_DIST=1 BIN_DIST_NAME=$(BIN_DIST_NAME) \
+               prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+               exec_prefix=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME) \
+               bindir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion) \
+               libdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs \
+               libexecdir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hslibs \
+               datadir=$(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/share/$$i-$(ProjectVersion) ;
+
+# Even more of a hack, but I'm too tired to fix this up right now..
+BIN_DIST_SCRIPTS_NEEDING_RENAMING=ghc stat2resid hstags mkdependHS
+
+binary-dist::
+       @for i in $(BIN_DIST_SCRIPTS_NEEDING_RENAMING); do \
+            echo "Renaming $$i to $$i.prl"; \
+           $(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/$$i  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/bin/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/$$i.prl; \
+       done
+       @echo "Renaming hscpp to hscpp.prl"
+       @$(MV) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hscpp  $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/lib/$(TARGETPLATFORM)/ghc-$(ProjectVersion)/hscpp.prl
 
 dist :: dist-pre
 include $(TOP)/mk/target.mk
 dist :: dist-post
 
+binary-dist::
+       @echo "Mechanical and super-natty! Inspect the result and *if* happy; freeze, sell and get some sleep!"