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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 131aaf6..dfa9a9b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -320,6 +320,9 @@ LIBM=@LIBM@
 #
 GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
 
+X_CFLAGS=@X_CFLAGS@
+X_LIBS=@X_LIBS@
+
 ################################################################################
 #
 #		happy project
@@ -431,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@
 
@@ -609,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)