From 3ca47cbd5a24f01aca3420407aa22b84396d674d Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Thu, 28 Aug 2008 18:21:48 +0000 Subject: [PATCH] Tweaks for installs into a DESTDIR --- mk/cabal.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mk/cabal.mk b/mk/cabal.mk index 8c486a9..bdf8e99 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) -- 1.7.10.4