support use of configure --docdir argument

Value of docdir was being overridden in Makefile.

Retain compatibility with old Autoconf versions that do not provide
docdir.
This commit is contained in:
Chris Mayo 2015-12-27 18:55:05 +00:00
parent 050f2d28be
commit ccffcbd9e9
2 changed files with 6 additions and 1 deletions

View File

@ -136,7 +136,6 @@ googleinclude_HEADERS = \
src/google/stacktrace.h \ src/google/stacktrace.h \
src/google/tcmalloc.h src/google/tcmalloc.h
docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
# This is for HTML and other documentation you want to install. # This is for HTML and other documentation you want to install.
# Add your documentation files (in doc/) in addition to these # Add your documentation files (in doc/) in addition to these
# top-level boilerplate files. Also add a TODO file if you have one. # top-level boilerplate files. Also add a TODO file if you have one.

View File

@ -31,6 +31,12 @@ AC_SUBST(TC_VERSION_MINOR)
AC_SUBST(TC_VERSION_PATCH) AC_SUBST(TC_VERSION_PATCH)
AC_SUBST(PACKAGE_STRING) AC_SUBST(PACKAGE_STRING)
# docdir not defined by autoconf < 2.59c
if test "$docdir" = ""; then
docdir='${datadir}/doc/${PACKAGE}-${VERSION}'
fi
AC_SUBST(docdir)
# The user can choose not to compile in the heap-profiler, the # The user can choose not to compile in the heap-profiler, the
# heap-checker, or the cpu-profiler. There's also the possibility # heap-checker, or the cpu-profiler. There's also the possibility
# for a 'fully minimal' compile, which leaves out the stacktrace # for a 'fully minimal' compile, which leaves out the stacktrace