diff --git a/Makefile b/Makefile
index 8e07cf3..979fa73 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,19 @@
-# export CXX     ?= $(shell wx-config --cxx)
-# export CFLAGS  ?= -O2 -Wall $(shell wx-config --cxxflags)
-# export GUILIBS ?= $(shell wx-config --libs adv,core,base)
-# export LIBS    ?= $(shell wx-config --libs base)
-# export LDFLAGS ?= 
+export DATADIR := "/usr/share/ircddbgateway"
+export LOGDIR  := "/var/log"
+export CONFDIR := "/etc"
+export BINDIR  := "/usr/bin"
 
-all:	ircDDBGateway/ircddbgatewayd
+# Add -DDCS_LINK to the end of the CFLAGS line below to add DCS linking to StarNet
+# Add -DDEXTRA_LINK to the end of the CFLAGS line below to add DExtra linking to StarNet
+
+export CXX     := $(shell wx-config --cxx)
+export CFLAGS  := -O2 -Wall $(shell wx-config --cxxflags) -DLOG_DIR='$(LOGDIR)' -DCONF_DIR='$(CONFDIR)' -DDATA_DIR='$(DATADIR)'
+export GUILIBS := $(shell wx-config --libs adv,core,base)
+export LIBS    := $(shell wx-config --libs base)
+export LDFLAGS := 
+
+all:	ircDDBGateway/ircddbgatewayd ircDDBGatewayConfig/ircddbgatewayconfig APRSTransmit/aprstransmitd RemoteControl/remotecontrold \
+	StarNetServer/starnetserverd TextTransmit/texttransmitd TimerControl/timercontrold TimeServer/timeserverd VoiceTransmit/voicetransmitd
 
 ircDDBGateway/ircddbgatewayd:	Common/Common.a ircDDB/IRCDDB.a
 	$(MAKE) -C ircDDBGateway
@@ -67,4 +76,3 @@ clean:
 	$(MAKE) -C TimeServer clean
 	$(MAKE) -C VoiceTransmit clean
 	$(MAKE) -C ircDDBGatewayConfig clean
-