Updated Branches: refs/heads/master 6a3f8fe92 -> 574d45a6c
TS-1202: install traffic_shell man/doc pages in a more appropriate location author: Igor Brezac review/commit: igalic, Arno Töll Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/574d45a6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/574d45a6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/574d45a6 Branch: refs/heads/master Commit: 574d45a6c494ab51197bb984e9142e7204841b1b Parents: 6a3f8fe Author: Igor GaliÄ <[email protected]> Authored: Tue Apr 17 23:17:43 2012 +0200 Committer: Igor GaliÄ <[email protected]> Committed: Tue Apr 17 23:17:43 2012 +0200 ---------------------------------------------------------------------- config.layout | 1 + configure.ac | 4 +++- doc/Makefile.am | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/574d45a6/config.layout ---------------------------------------------------------------------- diff --git a/config.layout b/config.layout index dab97be..51ee6cd 100644 --- a/config.layout +++ b/config.layout @@ -182,6 +182,7 @@ mandir: ${prefix}/share/man sysconfdir: /etc+ datadir: /var/cache+ + docdir: ${prefix}/share/doc+ installbuilddir: ${prefix}/share/trafficserver/build includedir: ${prefix}/include localstatedir: /var/run http://git-wip-us.apache.org/repos/asf/trafficserver/blob/574d45a6/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 3a8b159..7160aed 100644 --- a/configure.ac +++ b/configure.ac @@ -96,7 +96,7 @@ TS_CONFIG_NICE([config.nice]) AC_PREFIX_DEFAULT([/usr/local/trafficserver]) # Get the layout here, so we can pass the required variables to Trafficserver -TS_ENABLE_LAYOUT(TrafficServer, [cachedir]) +TS_ENABLE_LAYOUT(TrafficServer, [cachedir docdir]) # Reparse the configure arguments so we can override the layout. TS_PARSE_ARGUMENTS @@ -438,6 +438,7 @@ TS_SUBST_LAYOUT_PATH([localstatedir]) TS_SUBST_LAYOUT_PATH([runtimedir]) TS_SUBST_LAYOUT_PATH([logdir]) TS_SUBST_LAYOUT_PATH([cachedir]) +TS_SUBST_LAYOUT_PATH([docdir]) TS_SUBST([pkgbindir]) TS_SUBST([pkgsbindir]) @@ -449,6 +450,7 @@ TS_SUBST([pkglocalstatedir]) TS_SUBST([pkgruntimedir]) TS_SUBST([pkglogdir]) TS_SUBST([pkgcachedir]) +TS_SUBST([pkgdocdir]) # ----------------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/574d45a6/doc/Makefile.am ---------------------------------------------------------------------- diff --git a/doc/Makefile.am b/doc/Makefile.am index 95528e9..cf092d4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -trafficshelldir = $(pkgdatadir)/trafficshell +trafficshelldir = $(pkgdocdir)/trafficshell dist_trafficshell_DATA = \ man/config_alarms.1 \
