svn commit: r945019 - in /trafficserver/traffic/trunk/iocore/utils: I_Layout.h Layout.cc Makefile.am

[mt...@apache.org]

Author: mturk
Date: Mon May 17 08:30:38 2010
New Revision: 945019

URL: http://svn.apache.org/viewvc?rev=945019&view=rev
Log:
Layout uses relative paths to the prefix. Configure calculates relative paths unless they are outside the prefix in which case they are absolute

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=945019&r1=945018&r2=945019&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/I_Layout.h (original)
+++ trafficserver/traffic/trunk/iocore/utils/I_Layout.h Mon May 17 08:30:38 2010
@@ -51,6 +51,7 @@ struct Layout
   char *sharedstatedir;
   char *mandir;
   char *infodir;
+  char *cachedir;
 
   Layout(const char *prefix = 0);
    ~Layout();

Modified: trafficserver/traffic/trunk/iocore/utils/Layout.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Layout.cc?rev=945019&r1=945018&r2=945019&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Layout.cc (original)
+++ trafficserver/traffic/trunk/iocore/utils/Layout.cc Mon May 17 08:30:38 2010
@@ -144,6 +144,7 @@ Layout::Layout(const char *_prefix)
   sharedstatedir = layout_relative(prefix, SHAREDSTATEDIR);
   mandir = layout_relative(prefix, MANDIR);
   infodir = layout_relative(prefix, INFODIR);
+  cachedir = layout_relative(prefix, CACHEDIR);
 
 #ifdef DEBUG
 // TODO: Use a propper Debug logging
@@ -165,6 +166,7 @@ Layout::Layout(const char *_prefix)
   PrintSTR(sharedstatedir);
   PrintSTR(mandir);
   PrintSTR(infodir);
+  PrintSTR(cachedir);
 #endif
 
 }
@@ -187,5 +189,6 @@ Layout::~Layout()
   SafeFree(sharedstatedir);
   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=945019&r1=945018&r2=945019&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/utils/Makefile.am Mon May 17 08:30:38 2010
@@ -21,18 +21,19 @@ AM_CPPFLAGS = \
   -I$(top_srcdir)/iocore/eventsystem \
   -I$(top_srcdir)/libinktomi++ \
   -DPREFIX=\"$(prefix)\" \
-  -DEXEC_PREFIX=\"$(exec_prefix)\" \
-  -DBINDIR=\"$(bindir)\" \
-  -DSBINDIR=\"$(sbindir)\" \
-  -DSYSCONFDIR=\"$(sysconfdir)\" \
-  -DDATADIR=\"$(datadir)\" \
-  -DINCLUDEDIR=\"$(includedir)\" \
-  -DLIBDIR=\"$(libdir)\" \
-  -DLIBEXECDIR=\"$(libexecdir)\" \
-  -DLOCALSTATEDIR=\"$(localstatedir)\" \
-  -DSHAREDSTATEDIR=\"$(sharedstatedir)\" \
-  -DMANDIR=\"$(mandir)\" \
-  -DINFODIR=\"$(infodir)\"
+  -DEXEC_PREFIX=\"$(rel_exec_prefix)\" \
+  -DBINDIR=\"$(rel_bindir)\" \
+  -DSBINDIR=\"$(rel_sbindir)\" \
+  -DSYSCONFDIR=\"$(rel_sysconfdir)\" \
+  -DDATADIR=\"$(rel_datadir)\" \
+  -DINCLUDEDIR=\"$(rel_includedir)\" \
+  -DLIBDIR=\"$(rel_libdir)\" \
+  -DLIBEXECDIR=\"$(rel_libexecdir)\" \
+  -DLOCALSTATEDIR=\"$(rel_localstatedir)\" \
+  -DSHAREDSTATEDIR=\"$(rel_sharedstatedir)\" \
+  -DMANDIR=\"$(rel_mandir)\" \
+  -DCACHEDIR=\"$(rel_cachedir)\" \
+  -DINFODIR=\"$(rel_infodir)\"
 
 DEFS += @IOCORE_MODULARIZED_DEFS@