diff options
| author | Steve Bennett <steveb@workware.net.au> | 2015-04-06 15:15:34 +1000 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2015-04-29 13:10:28 +1000 |
| commit | 0d58231de3b8dd1f28fd9b6aea0de54ce00eb489 (patch) | |
| tree | 3348d7018aeae8bfda0fb86d36534ff64c51eec6 | |
| parent | af59339f008ae4eff13b0fea0eeff21a9d1e8b6c (diff) | |
| download | jimtcl-0d58231de3b8dd1f28fd9b6aea0de54ce00eb489.zip jimtcl-0d58231de3b8dd1f28fd9b6aea0de54ce00eb489.tar.gz jimtcl-0d58231de3b8dd1f28fd9b6aea0de54ce00eb489.tar.bz2 | |
add support for configure --docdir
Signed-off-by: Steve Bennett <steveb@workware.net.au>
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | auto.def | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 6645ddf..aa38da3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -25,6 +25,7 @@ LDLIBS += @LDLIBS@ LIBS += @LIBS@ exec_prefix ?= @exec_prefix@ prefix ?= @prefix@ +docdir = @docdir@ CC += -D_GNU_SOURCE -Wall $(OPTIM) -I. CXX += -D_GNU_SOURCE -Wall $(OPTIM) -I. @@ -73,8 +74,8 @@ docs: Tcl.html @if JIM_DOCS install-docs: docs - $(INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/doc/jim - $(INSTALL_DATA) Tcl.html $(DESTDIR)$(prefix)/doc/jim + $(INSTALL_DATA_DIR) $(DESTDIR)$(docdir) + $(INSTALL_DATA) Tcl.html $(DESTDIR)$(docdir) @else install-docs: @endif @@ -18,7 +18,8 @@ options { with-jim-shared shared => "build a shared library instead of a static library" jim-regexp=1 => "prefer POSIX regex if over the the built-in (Tcl-compatible) regex" docs=1 => "don't build or install the documentation" - random-hash => "randomise hash tables. more secure but hash table results are not predicable" + docdir:path => "path to install docs (if built)" + random-hash => "randomise hash tables. more secure but hash table results are not predicable" with-jim-ext: {with-ext:"ext1 ext2 ..."} => { Specify additional jim extensions to include. These are enabled by default: @@ -204,6 +205,11 @@ define LIBSOEXT [format [get-define SH_SOEXTVER] [format %.2f [expr {[get-define define JIM_INSTALL [opt-bool install-jim] define JIM_DOCS [opt-bool docs] define JIM_RANDOMISE_HASH [opt-bool random-hash] +if {[opt-val docdir] ne ""} { + define docdir [opt-val docdir] +} else { + define docdir {${prefix}/docs/jim} +} # Attributes of the extensions # tcl=Pure Tcl extension |