projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wibble some variable definitions to fix installation of bindists
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
1610875
..
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.
@@
-322,7
+321,7
@@
$(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
install.library.%: installPackage/installPackage ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
cd $* && \
install.library.%: installPackage/installPackage ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
cd $* && \
- ../installPackage/installPackage "$(DESTDIR)" $(prefix) $(datadir) $(libraryhtmldir) $(GHC_PKG_PROG) $(DESTDIR)$(libdir)/package.conf; \
+ ../installPackage/installPackage "$(DESTDIR)" "$(prefix)" "$(datadir)" "$(libraryhtmldir)" "$(GHC_PKG_PROG)" "$(DESTDIR)$(libdir)/package.conf" ; \
fi
.PHONY: binary-dist binary-dist.library.%
fi
.PHONY: binary-dist binary-dist.library.%