From 2a0e64c9d44102efedca5ffda52d0137a9e56e0d Mon Sep 17 00:00:00 2001
From: "Leigh B. Stoller" <stoller@flux.utah.edu>
Date: Fri, 18 Jan 2002 19:22:03 +0000
Subject: [PATCH] Convert to use config.h, and replace hardwired FS dirs with
 configure defines.

---
 tmcd/GNUmakefile.in | 3 +--
 tmcd/tmcc.c         | 1 +
 tmcd/tmcd.c         | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tmcd/GNUmakefile.in b/tmcd/GNUmakefile.in
index 2dc1b1201..546986d73 100644
--- a/tmcd/GNUmakefile.in
+++ b/tmcd/GNUmakefile.in
@@ -12,8 +12,7 @@ all:	tmcd tmcc tmcd.restart findif
 
 include $(TESTBED_SRCDIR)/GNUmakerules
 
-CFLAGS	+= -O -g -DUDP -DTBDBNAME='"$(TBDBNAME)"' -I/usr/local/include \
-	-DFSNODE='"$(FSNODE)"' -DBOSSNODE='"$(BOSSNODE)"'
+CFLAGS	+= -O -g -DUDP -I${OBJDIR} -I/usr/local/include
 
 tmcd: tmcd.o
 	$(CC) $(CFLAGS) -o tmcd tmcd.o \
diff --git a/tmcd/tmcc.c b/tmcd/tmcc.c
index a92676379..94613f56a 100644
--- a/tmcd/tmcc.c
+++ b/tmcd/tmcc.c
@@ -17,6 +17,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include "decls.h"
+#include "config.h"
 
 #undef BOSSNODE
 
diff --git a/tmcd/tmcd.c b/tmcd/tmcd.c
index 40df09071..893f84f86 100644
--- a/tmcd/tmcd.c
+++ b/tmcd/tmcd.c
@@ -13,13 +13,14 @@
 #include <assert.h>
 #include <mysql/mysql.h>
 #include "decls.h"
+#include "config.h"
 
 /*
  * XXX This needs to be localized!
  */
-#define FSPROJDIR	FSNODE ":/q/proj"
-#define FSGROUPDIR	FSNODE ":/q/groups"
-#define FSUSERDIR	FSNODE ":/users"
+#define FSPROJDIR	FSNODE ":" FSDIR_PROJ
+#define FSGROUPDIR	FSNODE ":" FSDIR_GROUPS
+#define FSUSERDIR	FSNODE ":" FSDIR_USERS
 #define PROJDIR		"/proj"
 #define GROUPDIR	"/groups"
 #define USERDIR		"/users"
-- 
GitLab