From b2a4e6bd520b414d391ab90ec5550d5e66740504 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 5 Oct 2008 14:33:07 +0000 Subject: [PATCH] We need to set datadir = $(libdir) in bindists We already do in the normal Makefiles. This is because GHC needs package.conf and unlit to be in the same place (and things like ghc-pkg need to agree on where package.conf is, so we just set it globally). --- distrib/Makefile-bin-vars.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in index 18a73e7..cb69ac6 100644 --- a/distrib/Makefile-bin-vars.in +++ b/distrib/Makefile-bin-vars.in @@ -12,7 +12,10 @@ bindir = @bindir@ libdir = @libdir@/$(package)-$(version) libexecdir = $(libdir) datarootdir = @datarootdir@ -datadir = @datadir@/$(package)-$(version) +# datadir is set to libdir here as GHC needs package.conf and unlit +# to be in the same place (and things like ghc-pkg need to agree on +# where package.conf is, so we just set it globally). +datadir = $(libdir) platform = @TargetPlatform@ prefix = @prefix@ -- 1.7.10.4