From f52d23c224df889690a0535023db2ca3464f739c Mon Sep 17 00:00:00 2001 From: Kalle Olavi Niemitalo Date: Fri, 1 Dec 2006 22:31:16 +0200 Subject: [PATCH] make install-doc installs doc/python.txt too. --- Makefile.lib | 4 ++++ doc/Makefile | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/Makefile.lib b/Makefile.lib index 446c1e62..a81699c5 100644 --- a/Makefile.lib +++ b/Makefile.lib @@ -63,6 +63,10 @@ quiet_cmd_recmake = "[$(INFO_COLOR)MAKE $(3)$(END_COLOR)] $(RELPATH)$(2)" quiet_cmd_installdata = " [$(INSTALL_COLOR)INSTALL$(END_COLOR)] $(RELPATH)$(2) -> $(3)" cmd_installdata = $(INSTALL_DATA) $(2) $(3) +# Install a data file from the source (not build) directory +quiet_cmd_installsrcdata = " [$(INSTALL_COLOR)INSTALL$(END_COLOR)] $(RELPATH)$(2) -> $(3)" + cmd_installsrcdata = $(INSTALL_DATA) $(srcdir)$(2) $(3) + quiet_cmd_installprog = " [$(INSTALL_COLOR)INSTALL$(END_COLOR)] $(RELPATH)$(2) -> $(3)" cmd_installprog = $(INSTALL_PROGRAM) $(2) $(3) diff --git a/doc/Makefile b/doc/Makefile index 55c45610..6a5030b5 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -11,6 +11,7 @@ docdir = $(datadir)/doc # Used by install-doc HTML_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/html PDF_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/pdf +TXT_DIR = $(DESTDIR)$(docdir)/$(PACKAGE)/txt ASCIIDOC_CONF = $(srcdir)asciidoc.conf ASCIIDOC_FLAGS += -f $(ASCIIDOC_CONF) -a "builddir=$(CURDIR)/" @@ -25,6 +26,9 @@ TXT_DOCS_NOINSTALL = \ option-command.txt \ option-config.txt +TXT_DOCS_ASIS = \ + python.txt + HTML_DOCS-$(CONFIG_ASCIIDOC) += \ elinks.1.html \ elinks.conf.5.html \ @@ -82,6 +86,9 @@ install-doc: all-docs update-man install @$(foreach doc,$(PDF_DOCS), \ $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(PACKAGE)/pdf; \ $(call ncmd,installdata,$(doc),$(PDF_DIR));) + @$(foreach doc,$(TXT_DOCS_ASIS), \ + $(MKINSTALLDIRS) $(DESTDIR)$(docdir)/$(PACKAGE)/txt; \ + $(call ncmd,installsrcdata,$(doc),$(TXT_DIR));) update-man: man @$(if $(MAN_DOCS), \