X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=dfa9a9beefa9000c83a5f40c0ecf6cd870cd6e70;hb=0fa64bb9f9c587021529c64e28396ae08398555b;hp=c078d1ae67ec9b79e82cdec82b67b65ff03b9b31;hpb=13c670c3b50b0e2613458a73a1e05bb4a326f721;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index c078d1a..dfa9a9b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -240,13 +240,8 @@ DLLized=@EnableWin32DLLs@
 # GHC is still dependent on GNU tools in the backend (gcc to further process
 # .c/.hc/.s/.o files + 'perl' to mangle and split), but using this
 # option a GHC distribution can be put together which includes a minimal
-# set of these open source tools).
+# set of these open source tools. 
 #
-# One reason why this is a good thing is that it saves the user installing
-# something like cygwin first. Another positive effect of a GHC install now
-# being self-contained is that it will continue to work even if the user
-# installs a different C compiler (this has caused version problems in the
-# past).
 MinimalUnixDeps=@MinimalUnixDeps@
 
 # Don't split object files for libs if we're building DLLs, or booting from
@@ -277,7 +272,7 @@ StripLibraries=NO
 
 # For a debugging RTS:
 # GhcRtsHcOpts = -optc-DDEBUG
-# GhcRtsCcOpts = -optc-g
+# GhcRtsCcOpts = -g
 
 # For an optimised RTS:
 GhcRtsHcOpts=-O2
@@ -325,6 +320,9 @@ LIBM=@LIBM@
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
 
+X_CFLAGS=@X_CFLAGS@
+X_LIBS=@X_LIBS@
+
 ################################################################################
 #
 #		happy project
@@ -436,16 +434,16 @@ FPTOOLS_TOP_ABS_UNIX    = @hardtop@
 prefix			= @prefix@
 exec_prefix		= @exec_prefix@
 bindir			= @bindir@
-datadir			= @datadir@
+datadir			= @datadir@/$(ProjectNameShort)-$(ProjectVersion)
+
 #sysconfdir		= @datadir@
 #sharedstatedir		= @sharedstatedir@
 #localstatedir		= @localstatedir@
-libdir			= @libdir@
+libdir			= @libdir@/$(ProjectNameShort)-$(ProjectVersion)
 includedir		= @includedir@
 oldincludedir		= @oldincludedir@
 mandir			= @mandir@
 
-#UNUSED, see below: libexecdir              = @libexecdir@
 #UNUSED:infodir		= @infodir@
 #UNUSED:srcdir          = @srcdir@
 
@@ -614,10 +612,7 @@ endif
 endif
 
 # default C compiler flags
-SRC_CC_OPTS = -O
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_CC_OPTS += -mno-cygwin -mwin32
-endif
+SRC_CC_OPTS = @SRC_CC_OPTS@
 
 #-----------------------------------------------------------------------------
 # GMP Library (version 2.0.x or above)