Skip to content

Fix installation of documentation #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ylep wants to merge 2 commits into from
Closed

Fix installation of documentation #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e5b690e
Fix installation of documentation
sfabbro Aug 1, 2012
83be281
Merge branch 'master' into fix_doc_install
ylep Apr 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions doc/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

SUBDIRS = examples stencils doxygen

# docdir directory to install the doc (pdf ps html)
docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)

DVIPS=export TEXPICTS=$(srcdir); dvips
AM_MAKEINFOFLAGS = --no-split -I$(srcdir)
Expand Down Expand Up @@ -78,15 +76,15 @@ blitz.html: $(info_TEXINFOS) $(blitz_TEXINFOS)
# Install also the images into the directory html
install-html-local:
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
$(INSTALL_DATA) *.gif *.jpg $(DESTDIR)$(htmldir)
$(INSTALL_DATA) $(srcdir)/*.gif $(srcdir)/*.jpg $(DESTDIR)$(htmldir)

.PHONY: html

else

# Install also the images into the directory containing the html files
install-html-local:
$(INSTALL_DATA) $(srcdir)/*.gif $(srcdir)/*.jpg blitz.html
$(INSTALL_DATA) $(srcdir)/*.gif $(srcdir)/*.jpg $(top_builddir)/doc/blitz.html

endif

Expand Down
25 changes: 11 additions & 14 deletions doc/doxygen/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

# Support doxygen documentation ?

docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/doxygen

DISTCLEANFILES = Doxyfile doxygen-warning

Expand Down Expand Up @@ -84,29 +83,27 @@ clean-local:
$(RM) -rf latex; \
fi

# Install hooks
make-install-dirs:
@if test '!' -d $(DESTDIR)$(docdir) ; \
then mkdir -p $(DESTDIR)$(docdir) ; \
fi

install-data-hook: make-install-dirs
install-data-hook:
@if test -d html; then \
echo Installing HTML documentation into $(DESTDIR)$(docdir) ; \
$(INSTALL_DATA) html/* $(DESTDIR)$(docdir) ; \
echo Installing HTML documentation into $(DESTDIR)$(htmldir) ; \
$(MKDIR_P) $(DESTDIR)$(htmldir) ; \
cp -r html/* $(DESTDIR)$(htmldir) ; \
fi
@if test -f $(PACKAGE).pdf; then \
echo Installing PDF manual into $(DESTDIR)$(docdir) ; \
$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(docdir) ; \
echo Installing PDF manual into $(DESTDIR)$(pdfdir) ; \
$(MKDIR_P) $(DESTDIR)$(pdfdir) ; \
$(INSTALL_DATA) $(PACKAGE).pdf $(DESTDIR)$(pdfdir) ; \
fi
@if test -f $(PACKAGE).ps; then \
echo Installing PS manual into $(DESTDIR)$(docdir) ; \
$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(docdir) ; \
echo Installing PS manual into $(DESTDIR)$(psdir) ; \
$(MKDIR_P) $(DESTDIR)$(psdir) ; \
$(INSTALL_DATA) $(PACKAGE).ps $(DESTDIR)$(psdir) ; \
fi

uninstall-hook:
@echo Uninstalling doxygen documentation directory ; \
rm -rf "$(DESTDIR)$(docdir)";
rm -rf "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(psdir)" "$(DESTDIR)$(pdfdir)" ;