X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=f34540553d3c35affb48bbef8f1a5dc56b61b8cc;hb=da6b7fce09f98a0fbe66b6d218e6473c1845e354;hp=39147bf81848111c2843e99a10d11c92ac96c067;hpb=66ad533d80dc9730bc04ef37e5e130ec207ed86d;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index 39147bf..f345405 100644 --- a/ghc.mk +++ b/ghc.mk @@ -758,16 +758,24 @@ install_libs: $(INSTALL_LIBS) done install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS) +ifeq "$(INSTALL_LIBEXEC_SCRIPTS)" "" + @: +else $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) for i in $(INSTALL_LIBEXEC_SCRIPTS); do \ $(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ done +endif install_libexecs: $(INSTALL_LIBEXECS) +ifeq "$(INSTALL_LIBEXECS)" "" + @: +else $(INSTALL_DIR) $(DESTDIR)$(ghclibexecdir) for i in $(INSTALL_LIBEXECS); do \ $(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i $(DESTDIR)$(ghclibexecdir); \ done +endif install_topdir_scripts: $(INSTALL_TOPDIR_SCRIPTS) $(INSTALL_DIR) $(DESTDIR)$(topdir) @@ -789,18 +797,24 @@ install_headers: $(INSTALL_HEADERS) install_docs: $(INSTALL_HEADERS) $(INSTALL_DIR) $(DESTDIR)$(docdir) +ifneq "$(INSTALL_DOCS)" "" for i in $(INSTALL_DOCS); do \ $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \ done - $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \ - $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html; \ +endif + $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html + $(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html +ifneq "$(INSTALL_LIBRARY_DOCS)" "" for i in $(INSTALL_LIBRARY_DOCS); do \ $(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \ done +endif +ifneq "$(INSTALL_HTML_DOC_DIRS)" "" for i in $(INSTALL_HTML_DOC_DIRS); do \ $(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \ $(INSTALL_DOC) $(INSTALL_OPTS) $$i/* $(DESTDIR)$(docdir)/html/`basename $$i`; \ done +endif INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf.d @@ -915,7 +929,11 @@ windows-binary-dist-prep: cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2) windows-installer: +ifeq "$(ISCC)" "" + @echo No ISCC, so not making installer +else "$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss +endif nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done