Commit d5febf91 authored by Ian Lynagh's avatar Ian Lynagh

Don't use autoconf's datarootdir as <2.60 doesn't have it

parent ad94d409
......@@ -520,7 +520,12 @@ BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
# passing through, we might as well set them.
prefix = @prefix@
datarootdir = @datarootdir@
# New autoconf (>= 2.60?) make a configure with a --datarootdir=DIR flag.
# However, in order to support older autoconf's we don't use it.
# datarootdir is set lower down instead.
# datarootdir = @datarootdir@
exec_prefix = @exec_prefix@
bindir = @bindir@
datadir0 = @datadir@
......@@ -537,6 +542,7 @@ endif
# Hack: our directory layouts tend to be different on Windows, so
# hack around configure's bogus assumptions here.
datarootdir = $(prefix)
datadir = $(prefix)
libdir = $(prefix)
......@@ -546,8 +552,9 @@ else
# Unix: override libdir and datadir to put ghc-specific stuff in
# a subdirectory with the version number included.
#
libdir = $(libdir0)/ghc-$(ProjectVersion)
datadir = $(datadir0)/ghc-$(ProjectVersion)
datarootdir = $(datadir0)
datadir = $(datadir0)/ghc-$(ProjectVersion)
libdir = $(libdir0)/ghc-$(ProjectVersion)
endif # Windows
......
Markdown is supported
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