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/17 20:04:55 UTC

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

Author: mturk
Date: Mon May 17 18:04:55 2010
New Revision: 945276

URL: http://svn.apache.org/viewvc?rev=945276&view=rev
Log:
Use real sysconfdir when checking for root file

Modified:
    trafficserver/traffic/trunk/iocore/utils/Layout.cc
    trafficserver/traffic/trunk/iocore/utils/Makefile.am

Modified: trafficserver/traffic/trunk/iocore/utils/Layout.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Layout.cc?rev=945276&r1=945275&r2=945276&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Layout.cc (original)
+++ trafficserver/traffic/trunk/iocore/utils/Layout.cc Mon May 17 18:04:55 2010
@@ -24,7 +24,7 @@
 #include "inktomi++.h"
 #include "I_Layout.h"
 
-#define DEFAULT_TS_DIRECTORY_FILE SYSCONFDIR "/trafficserver-root"
+#define DEFAULT_TS_DIRECTORY_FILE SYSCONFIGDIR "/trafficserver-root"
 
 static Layout *layout = NULL;
 

Modified: trafficserver/traffic/trunk/iocore/utils/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Makefile.am?rev=945276&r1=945275&r2=945276&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Makefile.am (original)
+++ trafficserver/traffic/trunk/iocore/utils/Makefile.am Mon May 17 18:04:55 2010
@@ -25,6 +25,7 @@ AM_CPPFLAGS = \
   -DBINDIR=\"$(rel_bindir)\" \
   -DSBINDIR=\"$(rel_sbindir)\" \
   -DSYSCONFDIR=\"$(rel_sysconfdir)\" \
+  -DSYSCONFIGDIR=\"$(exp_sysconfdir)\" \
   -DDATADIR=\"$(rel_datadir)\" \
   -DINCLUDEDIR=\"$(rel_includedir)\" \
   -DLIBDIR=\"$(rel_libdir)\" \