You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/18 13:33:24 UTC
svn commit: r945595 - in /trafficserver/traffic/trunk/iocore/utils:
I_Layout.h Layout.cc Makefile.am
Author: mturk
Date: Tue May 18 11:33:24 2010
New Revision: 945595
URL: http://svn.apache.org/viewvc?rev=945595&view=rev
Log:
Add two remaining layout params
Modified:
trafficserver/traffic/trunk/iocore/utils/I_Layout.h
trafficserver/traffic/trunk/iocore/utils/Layout.cc
trafficserver/traffic/trunk/iocore/utils/Makefile.am
Modified: trafficserver/traffic/trunk/iocore/utils/I_Layout.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/I_Layout.h?rev=945595&r1=945594&r2=945595&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/I_Layout.h (original)
+++ trafficserver/traffic/trunk/iocore/utils/I_Layout.h Tue May 18 11:33:24 2010
@@ -48,6 +48,8 @@ struct Layout
char *libexecdir;
char *localstatedir;
char *sharedstatedir;
+ char *runtimedir;
+ char *logdir;
char *mandir;
char *infodir;
char *cachedir;
Modified: trafficserver/traffic/trunk/iocore/utils/Layout.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Layout.cc?rev=945595&r1=945594&r2=945595&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Layout.cc (original)
+++ trafficserver/traffic/trunk/iocore/utils/Layout.cc Tue May 18 11:33:24 2010
@@ -178,6 +178,8 @@ Layout::Layout(const char *_prefix)
libexecdir = layout_relative(prefix, LIBEXECDIR);
localstatedir = layout_relative(prefix, LOCALSTATEDIR);
sharedstatedir = layout_relative(prefix, SHAREDSTATEDIR);
+ runtimedir = layout_relative(prefix, RUNTIMEDIR);
+ logdir = layout_relative(prefix, LOGDIR);
mandir = layout_relative(prefix, MANDIR);
infodir = layout_relative(prefix, INFODIR);
cachedir = layout_relative(prefix, CACHEDIR);
@@ -200,6 +202,8 @@ Layout::Layout(const char *_prefix)
PrintSTR(libexecdir);
PrintSTR(localstatedir);
PrintSTR(sharedstatedir);
+ PrintSTR(runtimedir);
+ PrintSTR(logdir);
PrintSTR(mandir);
PrintSTR(infodir);
PrintSTR(cachedir);
@@ -223,6 +227,8 @@ Layout::~Layout()
SafeFree(libexecdir);
SafeFree(localstatedir);
SafeFree(sharedstatedir);
+ SafeFree(runtimedir);
+ SafeFree(logdir);
SafeFree(mandir);
SafeFree(infodir);
SafeFree(cachedir);
Modified: trafficserver/traffic/trunk/iocore/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Makefile.am?rev=945595&r1=945594&r2=945595&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/utils/Makefile.am Tue May 18 11:33:24 2010
@@ -32,6 +32,8 @@ AM_CPPFLAGS = \
-DLIBEXECDIR=\"$(rel_libexecdir)\" \
-DLOCALSTATEDIR=\"$(rel_localstatedir)\" \
-DSHAREDSTATEDIR=\"$(rel_sharedstatedir)\" \
+ -DRUNTIMEDIR=\"$(rel_runtimedir)\" \
+ -DLOGDIR=\"$(rel_logdir)\" \
-DMANDIR=\"$(rel_mandir)\" \
-DCACHEDIR=\"$(rel_cachedir)\" \
-DINFODIR=\"$(rel_infodir)\"