summaryrefslogtreecommitdiff
path: root/mk/package.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2007-05-31 14:35:05 +0000
committerIan Lynagh <igloo@earth.li>2007-05-31 14:35:05 +0000
commit430453c5131592b6147a80202dc5f7fbe3f3d5fd (patch)
tree9c7cdf6b13a8586dfa653bb9ff393da5640d2599 /mk/package.mk
parentad9d754d2b18d4dd027884e082c20777a29ef7d4 (diff)
downloadhaskell-430453c5131592b6147a80202dc5f7fbe3f3d5fd.tar.gz
Rework the build system a bit
Key changes: * Always build as if BIN_DIST is 1. BIN_DIST is thus removed. * Libraries are configured with prefix set to $$topdir rather than $(prefix)
Diffstat (limited to 'mk/package.mk')
-rw-r--r--mk/package.mk6
1 files changed, 0 insertions, 6 deletions
diff --git a/mk/package.mk b/mk/package.mk
index 29fdb99b7b..6c22535dbd 100644
--- a/mk/package.mk
+++ b/mk/package.mk
@@ -22,13 +22,8 @@ PKG_DATADIR = $$topdir
else
-ifeq "$(BIN_DIST)" ""
-PKG_LIBDIR = $(libdir)
-PKG_DATADIR = $(datadir)
-else
PKG_LIBDIR = $$libdir
PKG_DATADIR = $$datadir
-endif
endif # Unix
@@ -373,7 +368,6 @@ CLEAN_FILES += $(PACKAGE).haddock
$(HC) $(HC_OPTS) -D__HADDOCK__ -E $< -o $@
HTML_INSTALL_DIR = $(datadir)/html/libraries/$(PACKAGE)
-# NOT the same as HTML_DIR_INSTALLED when BIN_DIST is on
install-docs :: $(HTML_DOC)
@$(INSTALL_DIR) $(HTML_INSTALL_DIR)