summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-08-28 18:21:48 +0000
committerIan Lynagh <igloo@earth.li>2008-08-28 18:21:48 +0000
commit3ca47cbd5a24f01aca3420407aa22b84396d674d (patch)
tree357012123820c28d6564a029810660225ef9aa7c /mk
parent7ed521a86ed69629cc77efb8bb44f620b046404c (diff)
downloadhaskell-3ca47cbd5a24f01aca3420407aa22b84396d674d.tar.gz
Tweaks for installs into a DESTDIR
Diffstat (limited to 'mk')
-rw-r--r--mk/cabal.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/cabal.mk b/mk/cabal.mk
index 8c486a982e..bdf8e9918f 100644
--- a/mk/cabal.mk
+++ b/mk/cabal.mk
@@ -43,10 +43,13 @@ with-stage-2:
$(CABAL) build --distpref dist-install $(DYN_FLAGS) $(BUILD_FLAGS)
install:
- $(INSTALL_PACKAGE) install UNUSED UNUSED '$(DESTDIR)' '$(prefix)' \
+ $(INSTALL_PACKAGE) install \
+ '$(DESTDIR)$(bindir)/ghc-pkg' \
+ '$(DESTDIR)$(datadir)/package.conf' \
+ '$(DESTDIR)' '$(prefix)' \
'$(prefix)' '$(bindir)' '$(libdir)' \
- '$(libexecdir)' '$(dynlibdir)' '$(datadir)' \
- '$(docdir)' '$(htmldir)' '$(haddockdir)' \
+ '$(libexecdir)' '$(dynlibdir)' '$(datadir)' \
+ '$(docdir)' '$(htmldir)' '$(haddockdir)' \
--distpref dist-install \
$(INSTALL_FLAGS)