From 9f725193e528240b71dbdd02ef58d41be31462ac Mon Sep 17 00:00:00 2001
From: Tom Early <n7tae@tearly.net>
Date: Thu, 19 May 2022 14:11:31 -0700
Subject: [PATCH] don't conditionally define macros

---
 QnetConfigure.cpp | 4 ----
 QnetGateway.cpp   | 4 ----
 QnetLink.cpp      | 6 ------
 QnetRemote.cpp    | 4 ----
 4 files changed, 18 deletions(-)

diff --git a/QnetConfigure.cpp b/QnetConfigure.cpp
index 03efbe9..43b4dad 100644
--- a/QnetConfigure.cpp
+++ b/QnetConfigure.cpp
@@ -73,10 +73,6 @@ bool CQnetConfigure::ReadConfigFile(const char *configfile, std::map<std::string
 	return true;
 }
 
-#ifndef CFG_DIR
-#define CFG_DIR "/usr/local/etc"
-#endif
-
 bool CQnetConfigure::Initialize(const char *file)
 {
 	std::string filename(CFG_DIR);
diff --git a/QnetGateway.cpp b/QnetGateway.cpp
index a6f4fa8..1808776 100644
--- a/QnetGateway.cpp
+++ b/QnetGateway.cpp
@@ -50,10 +50,6 @@
 #include "QnetGateway.h"
 #include "Utilities.h"
 
-#ifndef CFG_DIR
-#define CFG_DIR "/usr/local/etc"
-#endif
-
 const std::string GW_VERSION("QnetGateway-20320");
 
 int CQnetGateway::FindIndex(const int i) const
diff --git a/QnetLink.cpp b/QnetLink.cpp
index 8660fd9..cd8be4a 100644
--- a/QnetLink.cpp
+++ b/QnetLink.cpp
@@ -55,12 +55,6 @@
 #include "Utilities.h"
 
 #define LINK_VERSION "QnetLink-607"
-#ifndef BIN_DIR
-#define BIN_DIR "/usr/local/bin"
-#endif
-#ifndef CFG_DIR
-#define CFG_DIR "/usr/local/etc"
-#endif
 
 CQnetLink::CQnetLink()
 {
diff --git a/QnetRemote.cpp b/QnetRemote.cpp
index db22794..897d310 100644
--- a/QnetRemote.cpp
+++ b/QnetRemote.cpp
@@ -41,10 +41,6 @@
 
 #define VERSION "v523"
 
-#ifndef CFG_DIR
-#define CFG_DIR "/usr/local/etc"
-#endif
-
 static int module;
 static time_t tNow = 0;
 static short streamid_raw = 0;