From 87f7cd0370f67c867998d0f0662629516b4c67ce Mon Sep 17 00:00:00 2001 From: Mahmoud Al-Qudsi Date: Thu, 28 Dec 2017 15:22:31 -0600 Subject: [PATCH] Fix `make install` failure on missing man pages If `doxygen` isn't installed, the man files aren't built and that's quite ok. The cmake `install` target was presuming the man files would always be present and the install stage was failing if they weren't built. --- cmake/Install.cmake | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake/Install.cmake b/cmake/Install.cmake index 1982ca150..7dfd454f0 100644 --- a/cmake/Install.cmake +++ b/cmake/Install.cmake @@ -164,8 +164,9 @@ INSTALL(DIRECTORY share/tools/web_config #$v test -z "$(wildcard share/man/man1/*.1)" || $(INSTALL) -m 644 $(filter-out $(addprefix share/man/man1/, $(CONDEMNED_PAGES)), $(wildcard share/man/man1/*.1)) #$(DESTDIR)$(datadir)/fish/man/man1/ #TODO: CONDEMNED_PAGES +# Building the man pages is optional: if doxygen isn't installed, they're not built INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/man/ - DESTINATION ${rel_datadir}/fish/man/) + DESTINATION ${rel_datadir}/fish/man/ OPTIONAL) # @echo "Installing more man pages"; # $v $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1; @@ -173,7 +174,8 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/share/man/ # $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \ # true; \ # done; -INSTALL(FILES ${MANUALS} DESTINATION ${mandir}/man1/) +# Building the man pages is optional: if doxygen isn't installed, they're not built +INSTALL(FILES ${MANUALS} DESTINATION ${mandir}/man1/ OPTIONAL) # $v $(INSTALL) -m 644 share/lynx.lss $(DESTDIR)$(datadir)/fish/ INSTALL(FILES share/lynx.lss DESTINATION ${rel_datadir}/fish/)