X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=d6d552b215ab2cec7c3d02370b61a73e70b1013c;hb=21f6837358d3443e2acba817e8a2edb57c5905e7;hp=40167e76645be56a4a667a7c6615f7185341612f;hpb=a0813f934bb8a3510751c9a552fdd6bb9e922b64;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index 40167e7..d6d552b 100644 --- a/Makefile +++ b/Makefile @@ -35,16 +35,6 @@ project-check : fi # ----------------------------------------------------------------------------- -# Make sure configure is up-to-date - -all install dist binary-dist :: configure -configure :: configure.in - @echo "WARNING: configure needs to be regenerated. Type" - @echo " make -f Makefile.config ./configure" - @echo "and rerun make." - @exit 16 - -# ----------------------------------------------------------------------------- # Making a binary distribution # # To make a particular binary distribution: @@ -171,6 +161,7 @@ binary-dist:: BINDIST_DOCS = $($(Project)BinDistDocs) BINDIST_DOCS_WAYS = html ps +ifeq "$(HOSTPLATFORM)" "i386-unknown-linux" binary-dist :: @for way in $(BINDIST_DOCS_WAYS); do \ $(MKDIRHIER) $(BIN_DIST_TMPDIR)/$(BIN_DIST_NAME)/$$way; \ @@ -189,6 +180,7 @@ binary-dist :: done; \ done @rm -f .doclog +endif # Rename scripts to $i.prl and $i.sh where necessary. # ToDo: do this in a cleaner way... @@ -262,6 +254,7 @@ SRC_DIST_DIRS += docs distrib $(SUBDIRS) SRC_DIST_FILES += \ configure.in config.guess config.sub configure \ aclocal.m4 acconfig.h README Makefile install-sh \ + mk/bootstrap.mk \ mk/boilerplate.mk mk/config.h.in mk/config.mk.in mk/opts.mk \ mk/paths.mk mk/suffix.mk mk/target.mk @@ -298,8 +291,6 @@ dist-package-zip :: DIST_CLEAN_FILES += config.cache config.status -MAINTAINER_CLEAN_FILES += configure - all :: @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ for i in $(SUBDIRS); do \