Commit ea008a4dae0029666e66b7628f5c0784d40abf96
1 parent
1d2ae843
Adapt Makefile rules for correct installation of ctools documentation
Showing
1 changed file
with
13 additions
and
4 deletions
Makefile.am
| @@ -25,14 +25,20 @@ doc_DATA = \ | @@ -25,14 +25,20 @@ doc_DATA = \ | ||
| 25 | README | 25 | README |
| 26 | docdir = ${datadir}/doc/${PACKAGE} | 26 | docdir = ${datadir}/doc/${PACKAGE} |
| 27 | 27 | ||
| 28 | -install-data-local: $(HTML_INSTALL_DATA_TARGETS) | 28 | +#install-data-local: $(HTML_INSTALL_DATA_TARGETS) |
| 29 | +#uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS) | ||
| 29 | 30 | ||
| 30 | -uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS) | 31 | +install-data-local: $(DOXYGEN_INSTALL_DATA_TARGETS) sphinx-install |
| 32 | + | ||
| 33 | +uninstall-local: $(DOXYGEN_UNINSTALL_DATA_TARGETS) | ||
| 31 | 34 | ||
| 32 | # | 35 | # |
| 33 | # Additional rules | 36 | # Additional rules |
| 34 | # | 37 | # |
| 35 | 38 | ||
| 39 | +# Rules | ||
| 40 | +.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL) | ||
| 41 | + | ||
| 36 | # Print out all rules | 42 | # Print out all rules |
| 37 | help: | 43 | help: |
| 38 | @echo "make targets:"; \ | 44 | @echo "make targets:"; \ |
| @@ -227,6 +233,7 @@ doxygen: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) | @@ -227,6 +233,7 @@ doxygen: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) | ||
| 227 | 233 | ||
| 228 | # Install Doxygen files | 234 | # Install Doxygen files |
| 229 | DOCDIRS = html/doxygen man/man3 | 235 | DOCDIRS = html/doxygen man/man3 |
| 236 | +DOXYGEN_INSTALL_DATA_TARGETS = doxygen-install | ||
| 230 | doxygen-install: | 237 | doxygen-install: |
| 231 | $(mkinstalldirs) $(DESTDIR)$(docdir) | 238 | $(mkinstalldirs) $(DESTDIR)$(docdir) |
| 232 | @for dir in $(DOCDIRS) ; do \ | 239 | @for dir in $(DOCDIRS) ; do \ |
| @@ -238,14 +245,16 @@ doxygen-install: | @@ -238,14 +245,16 @@ doxygen-install: | ||
| 238 | done | 245 | done |
| 239 | 246 | ||
| 240 | # Uninstall Doxygen files | 247 | # Uninstall Doxygen files |
| 248 | +DOXYGEN_UNINSTALL_DATA_TARGETS = doxygen-uninstall | ||
| 241 | doxygen-uninstall: | 249 | doxygen-uninstall: |
| 242 | for dir in $(DOCDIRS) ; do \ | 250 | for dir in $(DOCDIRS) ; do \ |
| 243 | rm -f -r $(DESTDIR)$(docdir)/$$dir ; \ | 251 | rm -f -r $(DESTDIR)$(docdir)/$$dir ; \ |
| 244 | done | 252 | done |
| 245 | 253 | ||
| 246 | @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) | 254 | @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) |
| 247 | - rm -rf @DX_DOCDIR@ | ||
| 248 | - $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) | 255 | + rm -rf @DX_DOCDIR@ |
| 256 | + $(mkinstalldirs) $(srcdir)/doc/html/doxygen | ||
| 257 | + $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) | ||
| 249 | 258 | ||
| 250 | DX_CLEANFILES = \ | 259 | DX_CLEANFILES = \ |
| 251 | @DX_DOCDIR@/@PACKAGE@.tag \ | 260 | @DX_DOCDIR@/@PACKAGE@.tag \ |