Commit 2a0e64c9 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Convert to use config.h, and replace hardwired FS dirs with configure

defines.
parent fbad515c
...@@ -12,8 +12,7 @@ all: tmcd tmcc tmcd.restart findif ...@@ -12,8 +12,7 @@ all: tmcd tmcc tmcd.restart findif
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
CFLAGS += -O -g -DUDP -DTBDBNAME='"$(TBDBNAME)"' -I/usr/local/include \ CFLAGS += -O -g -DUDP -I${OBJDIR} -I/usr/local/include
-DFSNODE='"$(FSNODE)"' -DBOSSNODE='"$(BOSSNODE)"'
tmcd: tmcd.o tmcd: tmcd.o
$(CC) $(CFLAGS) -o tmcd tmcd.o \ $(CC) $(CFLAGS) -o tmcd tmcd.o \
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#include "decls.h" #include "decls.h"
#include "config.h"
#undef BOSSNODE #undef BOSSNODE
......
...@@ -13,13 +13,14 @@ ...@@ -13,13 +13,14 @@
#include <assert.h> #include <assert.h>
#include <mysql/mysql.h> #include <mysql/mysql.h>
#include "decls.h" #include "decls.h"
#include "config.h"
/* /*
* XXX This needs to be localized! * XXX This needs to be localized!
*/ */
#define FSPROJDIR FSNODE ":/q/proj" #define FSPROJDIR FSNODE ":" FSDIR_PROJ
#define FSGROUPDIR FSNODE ":/q/groups" #define FSGROUPDIR FSNODE ":" FSDIR_GROUPS
#define FSUSERDIR FSNODE ":/users" #define FSUSERDIR FSNODE ":" FSDIR_USERS
#define PROJDIR "/proj" #define PROJDIR "/proj"
#define GROUPDIR "/groups" #define GROUPDIR "/groups"
#define USERDIR "/users" #define USERDIR "/users"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment