projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Trac #3087: derived Data now defines dataCast1/2
[ghc-hetmet.git]
/
mk
/
package.mk
diff --git
a/mk/package.mk
b/mk/package.mk
index
44087aa
..
079e4f6
100644
(file)
--- a/
mk/package.mk
+++ b/
mk/package.mk
@@
-84,7
+84,9
@@
install::
-x c $(PACKAGE_CPP_OPTS) package.conf.in \
| grep -v '^#pragma GCC' \
| sed -e 's/""//g' -e 's/:[ ]*,/: /g' \
-x c $(PACKAGE_CPP_OPTS) package.conf.in \
| grep -v '^#pragma GCC' \
| sed -e 's/""//g' -e 's/:[ ]*,/: /g' \
- | $(GHC_PKG_PROG) --global-conf $(DESTDIR)$(libdir)/package.conf update - --force
+ | $(GHC_PKG_INSTALL_PROG) --global-conf $(DESTDIR)$(datadir)/package.conf update - --force
+
+GHC_PKG_INSTALL_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/dist-install/build/ghc-pkg/ghc-pkg
# we could be more accurate here and add a dependency on
# driver/package.conf, but that doesn't work too well because of
# we could be more accurate here and add a dependency on
# driver/package.conf, but that doesn't work too well because of
@@
-138,6
+140,7
@@
ifeq "$(NON_HS_PACKAGE)" ""
SRC_HC_OPTS += -XGenerics
endif
SRC_HC_OPTS += -XGenerics
endif
+ifndef DONT_WANT_STD_LIBRARY
ifndef LIBRARY
ifeq "$(_way:%_dyn=YES)" "YES"
LIBRARY = libHS$(PACKAGE)$(_way:%_dyn=%)-ghc$(ProjectVersion)$(soext)
ifndef LIBRARY
ifeq "$(_way:%_dyn=YES)" "YES"
LIBRARY = libHS$(PACKAGE)$(_way:%_dyn=%)-ghc$(ProjectVersion)$(soext)
@@
-145,11
+148,13
@@
else
LIBRARY = libHS$(PACKAGE)$(_way).a
endif
endif
LIBRARY = libHS$(PACKAGE)$(_way).a
endif
endif
+endif
ifeq "$(WAYS)" ""
WAYS = $(GhcLibWays)
endif
ifeq "$(WAYS)" ""
WAYS = $(GhcLibWays)
endif
+ifdef LIBRARY
all :: $(LIBRARY)
# POSSIBLE alternative version using --make:
all :: $(LIBRARY)
# POSSIBLE alternative version using --make:
@@
-174,6
+179,7
@@
ifeq "$(DLLized)" "YES"
INSTALL_PROGS += $(DLL_NAME)
INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
endif
INSTALL_PROGS += $(DLL_NAME)
INSTALL_LIBS += $(patsubst %.a,%_imp.a, $(LIBRARY))
endif
+endif
# The interface files are put inside the $(libdir), since they
# might (potentially) be platform specific..
# The interface files are put inside the $(libdir), since they
# might (potentially) be platform specific..
@@
-268,13
+274,6
@@
ifneq "$(HS_PPS)" ""
CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
CLEAN_FILES += $(HS_PPS) $(addsuffix .tmp, $(HS_SRCS))
-ifeq "$(HADDOCK)" ""
-html ::
- @echo Haddock must be installed in order to build HTML library documentation.
- @echo Please install Haddock and re-configure.
- @exit 1
-endif
-
html :: $(HTML_DOC)
extraclean ::
html :: $(HTML_DOC)
extraclean ::