X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=23042a44a555197990e0db968eeb0cfa6e8e3741;hb=bee714f24278a678cd7082421cc27da4b9c4d72a;hp=739b7c2d26eeec5d15f42a124271dca7745b3eb8;hpb=579b46fe35098fc4c934e279db7323e3786cde19;p=ghc-hetmet.git diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile index 739b7c2..23042a4 100644 --- a/ghc/compiler/Makefile +++ b/ghc/compiler/Makefile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------------- -# $Id: Makefile,v 1.201 2001/11/09 18:17:48 sof Exp $ +# $Id: Makefile,v 1.203 2001/11/19 18:47:43 sof Exp $ TOP = .. include $(TOP)/mk/boilerplate.mk @@ -113,9 +113,9 @@ ifeq "$(BootingFromHc)" "YES" bootstrapped = YES compiling_with_4xx=NO else -bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt)0); then echo YES; else echo NO; fi) -compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 5000); then echo YES; else echo NO; fi) -ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 5020); then echo YES; else echo NO; fi) +bootstrapped = $(shell if (test $(GhcCanonVersion) -ge $(ProjectVersionInt)); then echo YES; else echo NO; fi) +compiling_with_4xx = $(shell if (test $(GhcCanonVersion) -lt 500); then echo YES; else echo NO; fi) +ghc_502_at_least = $(shell if (test $(GhcCanonVersion) -ge 502); then echo YES; else echo NO; fi) endif # Only include GHCi if we're bootstrapping with at least version 411 @@ -383,7 +383,7 @@ all :: ghc-inplace ghc-inplace : $(HS_PROG) @$(RM) $@ echo '#!/bin/sh' >>$@ - echo exec $(FPTOOLS_TOP_ABS_UNIX)/ghc/compiler/$(HS_PROG) '-B$(FPTOOLS_TOP_ABS)' '"$$@"' >>$@ + echo exec $(FPTOOLS_TOP_ABS)/ghc/compiler/$(HS_PROG) '-B$(FPTOOLS_TOP_ABS_PLATFORM)' '"$$@"' >>$@ chmod 755 $@ CLEAN_FILES += ghc-inplace