From e103630d2858bbfffffe1f846b44f7aaac0e9961 Mon Sep 17 00:00:00 2001 From: sof Date: Mon, 24 Mar 1997 08:39:19 +0000 Subject: [PATCH 1/1] [project @ 1997-03-24 08:39:18 by sof] Disable document generation for binary-dists --- Makefile | 74 +++++++++++++++++++++++++++++----------------------------- ghc/Makefile | 7 +++++- 2 files changed, 43 insertions(+), 38 deletions(-) diff --git a/Makefile b/Makefile index 71f9f31..09356fd 100644 --- a/Makefile +++ b/Makefile @@ -68,43 +68,43 @@ binary-dist:: @$(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 -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.." - @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.." - @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 + #$(MAKE) -C docs --no-print-directory $(MFLAGS) 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.." + #@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.." + #@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. diff --git a/ghc/Makefile b/ghc/Makefile index c95b80b..1386d2c 100644 --- a/ghc/Makefile +++ b/ghc/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.6 1997/03/24 04:39:38 sof Exp $ +# $Id: Makefile,v 1.7 1997/03/24 08:39:19 sof Exp $ # TOP=. @@ -26,4 +26,9 @@ else SUBDIRS = utils driver includes runtime docs lib compiler endif +# Easier to copy +ifeq "$(BIN_DIST)" "1" +SUBDIRS := $(filter-out docs,$(SUBDIRS)) +endif + include $(TOP)/mk/target.mk -- 1.7.10.4