Commit 85511088 authored by simonmar's avatar simonmar
Browse files

[project @ 2004-08-10 14:36:25 by simonmar]

Windows fixes.  There were some strange things going on with Windows
installation directories - I'm sure I've mucked up whatever was
happening with 'make install' for GHC on Windows, but there were
defintitely some bugs in here.  eg. we shouldn't have been setting
datadir to $(prefix)/imports unconditionally on Windows.

Make install now works for Happy, Alex and Haddock.  GHC probably
needs a bit of tweaking to get it working again.
parent cc33dd28
......@@ -528,8 +528,6 @@ FPTOOLS_TOP_ABS_PLATFORM = @hardtop_plat@
# but since the configure script has them on offer while
# passing through, we might as well set them.
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
......@@ -539,52 +537,31 @@ includedir = @includedir@
oldincludedir = @oldincludedir@
mandir = @mandir@
ifeq "$(Windows)" "YES"
ifeq "$(strip $(prefix))" ""
prefix = c:/ghc
endif
ifacedir = $(libdir)
ifeq "$(strip $(exec_prefix))" ""
exec_prefix = $(prefix)
endif
ifeq "$(strip $(bindir))" ""
bindir = $(exec_prefix)/bin
endif
libexecdir = $(libdir)
ifeq "$(strip $(datadir))" ""
datadir = $(prefix)/imports
endif
ifeq "$(strip $(libdir))" ""
# Hack: our directory layouts tend to be different on Windows, so
# hack around configure's bogus assumptions here.
datadir = $(prefix)
libdir = $(prefix)
endif
ifeq "$(strip $(includedir))" ""
includedir = $(prefix)/include
endif
else
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
datadir0 = @datadir@
libdir0 = @libdir@
includedir = @includedir@
oldincludedir = @oldincludedir@
mandir = @mandir@
#
# override libdir and datadir to put project-specific stuff in
# Unix: override libdir and datadir to put project-specific stuff in
# a subdirectory with the version number included.
#
libdir = $(if $(ProjectNameShort),$(libdir0)/$(ProjectNameShort)-$(ProjectVersion),$(libdir0))
datadir = $(if $(ProjectNameShort),$(datadir0)/$(ProjectNameShort)-$(ProjectVersion),$(datadir0))
endif # Windows
# Default place for putting interface files is $(libdir)
# (overriden for packages in package.mk)
ifacedir = $(libdir)
ifacedir = $(libdir)
#
# Default values for most of the above are only set if
......@@ -623,8 +600,6 @@ ifeq "$(strip $(mandir))" ""
mandir = $(prefix)/man
endif
endif # i386-unknown-mingw32
################################################################################
#
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment