projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7ed521a
)
Tweaks for installs into a DESTDIR
author
Ian Lynagh
<igloo@earth.li>
Thu, 28 Aug 2008 18:21:48 +0000
(18:21 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 28 Aug 2008 18:21:48 +0000
(18:21 +0000)
mk/cabal.mk
patch
|
blob
|
history
diff --git
a/mk/cabal.mk
b/mk/cabal.mk
index
8c486a9
..
bdf8e99
100644
(file)
--- 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:
$(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)' \
'$(prefix)' '$(bindir)' '$(libdir)' \
- '$(libexecdir)' '$(dynlibdir)' '$(datadir)' \
- '$(docdir)' '$(htmldir)' '$(haddockdir)' \
+ '$(libexecdir)' '$(dynlibdir)' '$(datadir)' \
+ '$(docdir)' '$(htmldir)' '$(haddockdir)' \
--distpref dist-install \
$(INSTALL_FLAGS)
--distpref dist-install \
$(INSTALL_FLAGS)