From 0b3a94d51067b2ff39b7f952e8f5f74ec5b7e842 Mon Sep 17 00:00:00 2001 From: John Kerl Date: Tue, 29 Sep 2020 23:39:09 -0400 Subject: [PATCH] follow-on from doc/ -> docs/ for travis build --- Makefile.am | 2 +- Makefile.no-autoconfig | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 6e47ea3ee..eed1d2e58 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS=foreign EXTRA_DIST= LICENSE.txt README.md -SUBDIRS=c doc +SUBDIRS=c diff --git a/Makefile.no-autoconfig b/Makefile.no-autoconfig index 1aba61b01..e0ae29dbf 100644 --- a/Makefile.no-autoconfig +++ b/Makefile.no-autoconfig @@ -9,25 +9,25 @@ MANDIR ?= /usr/share/man DESTDIR ?= all: c manpage -devall: c install doc +devall: c install docs # TODO: the install target exists to put most-recent mlr executable in the # path to be picked up by the mlr-execs in the docs dir. better would be to # export PATH here with ./c at its head. c: .always make -C c -f Makefile.no-autoconfig top -doc: .always - cd doc && poki +docs: .always + cd docs && make html install: .always make -C c -f Makefile.no-autoconfig install install -d -m 0755 $(DESTDIR)/$(MANDIR) - install -m 0644 doc/miller.1 $(DESTDIR)/$(MANDIR) + install -m 0644 docs/miller.1 $(DESTDIR)/$(MANDIR) clean: .always make -C c -f Makefile.no-autoconfig clean .PHONY: manpage # OSX: # * brew install asciidoc # * export XML_CATALOG_FILES=/usr/local/etc/xml/catalog -manpage: doc/miller.1.txt - ( cd doc && a2x -d manpage -f manpage miller.1.txt ) +manpage: docs/miller.1.txt + ( cd docs && a2x -d manpage -f manpage miller.1.txt ) .always: @true