projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mostly fix Trac #2431: make empty case acceptable to (most of) GHC
[ghc-hetmet.git]
/
driver
/
Makefile
diff --git
a/driver/Makefile
b/driver/Makefile
index
3a87ab4
..
f552a36
100644
(file)
--- a/
driver/Makefile
+++ b/
driver/Makefile
@@
-7,22
+7,27
@@
TOP=..
include $(TOP)/mk/boilerplate.mk
TOP=..
include $(TOP)/mk/boilerplate.mk
-SUBDIRS = mangler split ghc ghci
+SUBDIRS = mangler split ghci
-boot all :: package.conf.inplace package.conf
+INPLACE_DATA_DIR = $(FPTOOLS_TOP_ABS)/inplace-datadir
+INPLACE_PKG_CONF = $(INPLACE_DATA_DIR)/package.conf
+# Used to signal that we are inplace, as opposed to installed:
+INPLACE_FILE = $(INPLACE_DATA_DIR)/inplace
-package.conf.inplace :
- echo "[]" > $@
+boot all ::
+ $(MKDIRHIER) $(INPLACE_DATA_DIR)
+ test -e $(INPLACE_PKG_CONF) || echo "[]" > $(INPLACE_PKG_CONF)
+ touch $(INPLACE_FILE)
-package.conf :
- echo "[]" > $@
-
-override datadir = $(libdir)
-INSTALL_DATAS += package.conf ghc-usage.txt ghci-usage.txt
+INSTALL_DATAS += ghc-usage.txt ghci-usage.txt
# Since cleaning effectively uninstalls all the packages, we must
# remove the stamp files that the build system uses to avoid unnecessarily
# Since cleaning effectively uninstalls all the packages, we must
# remove the stamp files that the build system uses to avoid unnecessarily
-# re-installing packages.
-CLEAN_FILES += package.conf* stamp-pkg-conf*
+# re-installing the RTS
+CLEAN_FILES += stamp-pkg-conf-rts
+
+binary-dist:
+ for FILE in Makefile $(INSTALL_DATAS); do echo $(WHERE_AM_I)/$$FILE >> $(BIN_DIST_LIST); done
+ set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d binary-dist WHERE_AM_I=$(WHERE_AM_I)/$$d; done
include $(TOP)/mk/target.mk
include $(TOP)/mk/target.mk