Changed the Makefile to no longer fail if man pages are missing, etc.

This commit is contained in:
ridiculousfish 2012-02-09 16:36:35 -08:00
parent 19cd7a248d
commit 646240fc54

View file

@ -583,12 +583,14 @@ install: all install-sh check-uninstall install-force
# #
# Force installation, even in presense of incompatible previous # Force installation, even in presense of incompatible previous
# version. This may fail. # version. This may fail.
# These 'true' lines are to prevent installs from failing for (e.g.) missing man pages.
# #
install-force: all install-translations install-force: all install-translations
$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) $(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
for i in $(PROGRAMS); do\ for i in $(PROGRAMS); do\
$(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \ $(INSTALL) -m 755 $$i $(DESTDIR)$(bindir) ; \
true ;\
done; done;
$(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish $(INSTALL) -m 755 -d $(DESTDIR)$(sysconfdir)/fish
$(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish $(INSTALL) -m 755 -d $(DESTDIR)$(datadir)/fish
@ -599,12 +601,15 @@ install-force: all install-translations
$(INSTALL) -m 644 share/config.fish $(DESTDIR)$(datadir)/fish/ $(INSTALL) -m 644 share/config.fish $(DESTDIR)$(datadir)/fish/
for i in $(COMPLETIONS_DIR_FILES); do \ for i in $(COMPLETIONS_DIR_FILES); do \
$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \ $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/completions/; \
true; \
done; done;
for i in $(FUNCTIONS_DIR_FILES); do \ for i in $(FUNCTIONS_DIR_FILES); do \
$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/functions/; \ $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/functions/; \
true; \
done; done;
for i in share/man/*.1; do \ for i in share/man/*.1; do \
$(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/man/; \ $(INSTALL) -m 644 $$i $(DESTDIR)$(datadir)/fish/man/; \
true; \
done; done;
$(INSTALL) -m 755 -d $(DESTDIR)$(docdir) $(INSTALL) -m 755 -d $(DESTDIR)$(docdir)
for i in user_doc/html/* ChangeLog; do \ for i in user_doc/html/* ChangeLog; do \
@ -615,6 +620,7 @@ install-force: all install-translations
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
for i in $(MANUALS); do \ for i in $(MANUALS); do \
$(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \ $(INSTALL) -m 644 $$i $(DESTDIR)$(mandir)/man1/; \
true; \
done; done;
@echo fish is now installed on your system. @echo fish is now installed on your system.
@echo To run fish, type \'fish\' in your terminal. @echo To run fish, type \'fish\' in your terminal.