Skip to content

Commit

Permalink
support use of configure --docdir argument
Browse files Browse the repository at this point in the history
Value of docdir was being overridden in Makefile.

Retain compatibility with old Autoconf versions that do not provide
docdir.
  • Loading branch information
cjmayo committed Dec 27, 2015
1 parent 050f2d2 commit ccffcbd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
1 change: 0 additions & 1 deletion Makefile.am
Expand Up @@ -136,7 +136,6 @@ googleinclude_HEADERS = \
src/google/stacktrace.h \
src/google/tcmalloc.h

docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
# This is for HTML and other documentation you want to install.
# Add your documentation files (in doc/) in addition to these
# top-level boilerplate files. Also add a TODO file if you have one.
Expand Down
6 changes: 6 additions & 0 deletions configure.ac
Expand Up @@ -31,6 +31,12 @@ AC_SUBST(TC_VERSION_MINOR)
AC_SUBST(TC_VERSION_PATCH)
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
# heap-checker, or the cpu-profiler. There's also the possibility
# for a 'fully minimal' compile, which leaves out the stacktrace
Expand Down

0 comments on commit ccffcbd

Please sign in to comment.