From 497c4e9eaca91229ddcefeae4f570cac72fc7150 Mon Sep 17 00:00:00 2001 From: "David B. Lamkins" Date: Fri, 14 Apr 2017 11:24:09 +0200 Subject: build: install miscellaneous documentation --- Makefile | 13 +++++++++++++ configure | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 96b53c7..3ac5334 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,13 @@ EXECUTABLES = $(ELF) vis-clipboard vis-complete vis-open MANUALS = $(EXECUTABLES:=.1) +DOCUMENTATION = LICENSE README.md + # conditionally initialized, this is needed for standalone build # with empty config.mk PREFIX ?= /usr/local SHAREPREFIX ?= ${PREFIX}/share +DOCPREFIX ?= ${SHAREPREFIX}/doc MANPREFIX ?= ${PREFIX}/man VERSION = $(shell git describe --always --dirty 2>/dev/null || echo "v0.3-git") @@ -126,6 +129,12 @@ install: $(ELF) cp -r lua/* ${DESTDIR}${SHAREPREFIX}/vis; \ rm -rf "${DESTDIR}${SHAREPREFIX}/vis/doc"; \ } + @echo installing documentation to ${DESTDIR}${DOCPREFIX}/vis + @mkdir -p ${DESTDIR}${DOCPREFIX}/vis + @for d in ${DOCUMENTATION}; do \ + cp "$$d" ${DESTDIR}${DOCPREFIX}/vis && \ + chmod 644 "${DESTDIR}${DOCPREFIX}/vis/$$d"; \ + done @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1 @mkdir -p ${DESTDIR}${MANPREFIX}/man1 @for m in ${MANUALS}; do \ @@ -138,6 +147,10 @@ uninstall: @for e in ${EXECUTABLES}; do \ rm -f ${DESTDIR}${PREFIX}/bin/"$$e"; \ done + @echo removing documentation from ${DESTDIR}${DOCPREFIX}/vis + @for d in ${DOCUMENTATION}; do \ + rm -f ${DESTDIR}${DOCPREFIX}/vis/"$$d"; \ + done @echo removing manual pages from ${DESTDIR}${MANPREFIX}/man1 @for m in ${MANUALS}; do \ rm -f ${DESTDIR}${MANPREFIX}/man1/"$$m"; \ diff --git a/configure b/configure index 8cfd512..24d4cd8 100755 --- a/configure +++ b/configure @@ -20,6 +20,7 @@ Installation directories: Fine tuning of the installation directories: --bindir=DIR user executables [EPREFIX/bin] --sharedir=DIR share directories [PREFIX/share] + --docdir=DIR misc. documentation [PREFIX/share/doc] --mandir=DIR man pages [PREFIX/share/man] Optional features: @@ -114,6 +115,7 @@ PREFIX=/usr/local EXEC_PREFIX='$(PREFIX)' BINDIR='$(EXEC_PREFIX)/bin' SHAREDIR='$(PREFIX)/share' +DOCDIR='$(PREFIX)/share/doc' MANDIR='$(PREFIX)/share/man' help=yes @@ -132,6 +134,7 @@ case "$arg" in --exec-prefix=*) EXEC_PREFIX=${arg#*=} ;; --bindir=*) BINDIR=${arg#*=} ;; --sharedir=*) SHAREDIR=${arg#*=} ;; +--docdir=*) DOCDIR=${arg#*=} ;; --mandir=*) MANDIR=${arg#*=} ;; --environment-only) environmentonly=yes ;; --static) static=yes ;; @@ -160,7 +163,7 @@ LDFLAGS=*) LDFLAGS=${arg#*=} ;; esac done -for i in SRCDIR PREFIX EXEC_PREFIX BINDIR SHAREDIR MANDIR ; do +for i in SRCDIR PREFIX EXEC_PREFIX BINDIR SHAREDIR DOCDIR MANDIR ; do stripdir $i done @@ -267,6 +270,7 @@ SRCDIR = $SRCDIR PREFIX = $PREFIX EXEC_PREFIX = $EXEC_PREFIX BINDIR = $BINDIR +DOCPREFIX = $DOCDIR MANPREFIX = $MANDIR SHAREPREFIX = $SHAREDIR CC = $CC -- cgit v1.2.3