projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the windres configure check, now that we use an in-tree windres
[ghc-hetmet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
9f516b7
..
e23db74
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-19,13
+19,9
@@
default:
@echo 'Run "make install" to install'
@false
@echo 'Run "make install" to install'
@false
-.PHONY: install
-install:
- $(MAKE) -r --no-print-directory -f ghc.mk install BINDIST=YES NO_INCLUDE_DEPS=YES
-
-.PHONY: show
-show:
- $(MAKE) -r --no-print-directory -f ghc.mk $@
+.PHONY: install show
+install show:
+ $(MAKE) -r --no-print-directory -f ghc.mk $@ BINDIST=YES NO_INCLUDE_DEPS=YES
else
else
@@
-49,7
+45,7
@@
endif
include mk/custom-settings.mk
# No need to update makefiles for these targets:
include mk/custom-settings.mk
# No need to update makefiles for these targets:
-REALGOALS=$(filter-out binary-dist bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help,$(MAKECMDGOALS))
+REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help,$(MAKECMDGOALS))
# configure touches certain files even if they haven't changed. This
# can mean a lot of unnecessary recompilation after a re-configure, so
# configure touches certain files even if they haven't changed. This
# can mean a lot of unnecessary recompilation after a re-configure, so
@@
-81,14
+77,20
@@
endif
@echo "===--- finished updating makefiles"
$(MAKE) -r --no-print-directory -f ghc.mk $@
@echo "===--- finished updating makefiles"
$(MAKE) -r --no-print-directory -f ghc.mk $@
-binary-dist:
+binary-dist: binary-dist-prep
+ifeq "$(mingw32_TARGET_OS)" "1"
+ mv bindistprep/*.exe .
+endif
+ mv bindistprep/*.tar.bz2 .
+
+binary-dist-prep:
ifeq "$(mingw32_TARGET_OS)" "1"
ifeq "$(mingw32_TARGET_OS)" "1"
- $(MAKE) -r --no-print-directory -f ghc.mk windows-binary-dist
+ $(MAKE) -r --no-print-directory -f ghc.mk windows-binary-dist-prep
$(MAKE) -r --no-print-directory -f ghc.mk windows-installer
else
rm -f bindist-list
$(MAKE) -r --no-print-directory -f ghc.mk bindist BINDIST=YES
$(MAKE) -r --no-print-directory -f ghc.mk windows-installer
else
rm -f bindist-list
$(MAKE) -r --no-print-directory -f ghc.mk bindist BINDIST=YES
- $(MAKE) -r --no-print-directory -f ghc.mk binary-dist
+ $(MAKE) -r --no-print-directory -f ghc.mk unix-binary-dist-prep
endif
clean distclean maintainer-clean:
endif
clean distclean maintainer-clean: