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:
c140c14
)
Wibble some variable definitions to fix installation of bindists
author
Ian Lynagh
<igloo@earth.li>
Thu, 6 Sep 2007 14:04:30 +0000
(14:04 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Thu, 6 Sep 2007 14:04:30 +0000
(14:04 +0000)
libraries/Makefile
patch
|
blob
|
history
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
8d6f8e1
..
d2e2b06
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-88,6
+88,8
@@
space=$(empty) $(empty)
# -----------------------------------------------------------------------------
# -----------------------------------------------------------------------------
+libraryhtmldir = $(htmldir)/libraries
+
ifneq "$(DOING_BIN_DIST)" "YES"
CONFIGURE_OPTS =
ifneq "$(DOING_BIN_DIST)" "YES"
CONFIGURE_OPTS =
@@
-195,13
+197,10
@@
configure: $(foreach SUBDIR,$(SUBDIRS), \
# the executable with the shell script on non-Windows. This should
# probably be tidied up so that we can always pass the same libsubdir.
ifeq "$(Windows)" "YES"
# the executable with the shell script on non-Windows. This should
# probably be tidied up so that we can always pass the same libsubdir.
ifeq "$(Windows)" "YES"
-datadir = $$prefix
libsubdir = $$pkgid
else
libsubdir = $$pkgid
else
-datadir = $$prefix/share/ghc
libsubdir = $$compiler/lib/$$pkgid
endif
libsubdir = $$compiler/lib/$$pkgid
endif
-libraryhtmldir = $(htmldir)/libraries
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.
# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
# being no 's inside the values.