diff options
author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-12-13 11:39:53 +0000 |
---|---|---|
committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-12-22 23:36:46 -0500 |
commit | 32b32d7fbc5544ad6c435a1ea26e6353ec567a9b (patch) | |
tree | 5e06cee9dd713bbbbc321181572d7c65597bbaa2 | |
parent | 914f7fe3756734714a6795fc4bbca96442b01f92 (diff) | |
download | haskell-32b32d7fbc5544ad6c435a1ea26e6353ec567a9b.tar.gz |
hadrian bindist: Install manpages to share/man/man1/ghc.1
When the installation makefile was copied over the manpages were no
longer installed in the correct place. Now we install it into share/man/man1/ghc.1
as the make build system did.
Fixes #22371
-rw-r--r-- | hadrian/bindist/Makefile | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/hadrian/bindist/Makefile b/hadrian/bindist/Makefile index 215c2665d9..2b0903796e 100644 --- a/hadrian/bindist/Makefile +++ b/hadrian/bindist/Makefile @@ -66,7 +66,7 @@ install_bin: install_bin_libdir install_wrappers endif install: install_bin install_lib -install: install_docs update_package_db +install: install_man install_docs update_package_db ActualBinsDir=${ghclibdir}/bin ifeq "$(RelocatableBuild)" "YES" @@ -187,19 +187,30 @@ install_lib: lib/settings install_docs: @echo "Copying docs to $(DESTDIR)$(docdir)" $(INSTALL_DIR) "$(DESTDIR)$(docdir)" - + if [ -d doc ]; then \ cd doc; $(FIND) . -type f -exec sh -c \ '$(INSTALL_DIR) "$(DESTDIR)$(docdir)/`dirname $$1`" && $(INSTALL_DATA) "$$1" "$(DESTDIR)$(docdir)/`dirname $$1`"' \ sh '{}' ';'; \ fi - + if [ -d docs-utils ]; then \ $(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/libraries/"; \ $(INSTALL_DATA) docs-utils/prologue.txt "$(DESTDIR)$(docdir)/html/libraries/"; \ $(INSTALL_SCRIPT) docs-utils/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"; \ fi +MAN_SECTION := 1 +MAN_PAGES := doc/users_guide/build-man/ghc.1 + +.PHONY: install_man +install_man: + if [ -f $(MAN_PAGES) ]; then \ + $(INSTALL_DIR) "$(DESTDIR)$(mandir)"; \ + $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man$(MAN_SECTION)"; \ + $(INSTALL_MAN) $(INSTALL_OPTS) $(MAN_PAGES) "$(DESTDIR)$(mandir)/man$(MAN_SECTION)"; \ + fi + export SHELL install_wrappers: install_bin_libdir @echo "Installing wrapper scripts" |