summaryrefslogtreecommitdiff
path: root/mk/suffix.mk
diff options
context:
space:
mode:
authorSimon Marlow <simonmar@microsoft.com>2006-04-07 02:05:11 +0000
committerSimon Marlow <simonmar@microsoft.com>2006-04-07 02:05:11 +0000
commit0065d5ab628975892cea1ec7303f968c3338cbe1 (patch)
tree8e2afe0ab48ee33cf95009809d67c9649573ef92 /mk/suffix.mk
parent28a464a75e14cece5db40f2765a29348273ff2d2 (diff)
downloadhaskell-0065d5ab628975892cea1ec7303f968c3338cbe1.tar.gz
Reorganisation of the source tree
Most of the other users of the fptools build system have migrated to Cabal, and with the move to darcs we can now flatten the source tree without losing history, so here goes. The main change is that the ghc/ subdir is gone, and most of what it contained is now at the top level. The build system now makes no pretense at being multi-project, it is just the GHC build system. No doubt this will break many things, and there will be a period of instability while we fix the dependencies. A straightforward build should work, but I haven't yet fixed binary/source distributions. Changes to the Building Guide will follow, too.
Diffstat (limited to 'mk/suffix.mk')
-rw-r--r--mk/suffix.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/suffix.mk b/mk/suffix.mk
index 984c311ef4..276c0c02f0 100644
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -26,7 +26,7 @@
# Haskell Suffix Rules
# The $(odir) support is for building GHC, where we need to build three
-# different versions from the same sources. See ghc/compiler/Makefile.
+# different versions from the same sources. See compiler/Makefile.
ifneq "$(odir)" ""
odir_ = $(odir)/
else
@@ -165,7 +165,7 @@ endif # BootingFromHc
#
ifneq "$(BootingFromHc)" "YES"
%_hsc.c %_hsc.h %.hs : %.hsc
- $(HSC2HS) $(HSC2HS_OPTS) $<
+ $(HSC2HS_INPLACE) $(HSC2HS_OPTS) $<
@touch $(patsubst %.hsc,%_hsc.c,$<)
endif