diff --git a/cde/programs/dtlogin/config/Makefile.am b/cde/programs/dtlogin/config/Makefile.am
index 6cebb90b2..c7dc5087d 100644
--- a/cde/programs/dtlogin/config/Makefile.am
+++ b/cde/programs/dtlogin/config/Makefile.am
@@ -4,10 +4,31 @@ AM_CPPFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
             -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
 	    -DKORNSHELL=$(KSH)
 
-if FREEBSD
-AM_CPPFLAGS += -DFREEBSD
+if LINUX
+AM_CPPFLAGS += -DXPROJECTROOT="/usr" -Dlinux -D__linux__
 endif
 
+if FREEBSD
+AM_CPPFLAGS += -DFREEBSD -DXPROJECTROOT="/usr/local" -D__FreeBSD__
+endif
+
+if SOLARIS
+AM_CPPFLAGS += -DXPROJECTROOT="/usr" -Dsun
+endif
+
+if OPENBSD
+AM_CPPFLAGS += -DXPROJECTROOT="/usr/X11R6" -D__OpenBSD__
+endif
+
+if NETBSD
+AM_CPPFLAGS += -DXPROJECTROOT="/usr/X11R7" -D__NetBSD__
+endif
+
+if BSD
+AM_CPPFLAGS += -DCSRG_BASED
+endif
+
+
 CPP_TARGETS = 0060.dtsysenv Dtlogin Xaccess Xconfig Xconfig.con	\
 	Xconfig.nc Xfailsafe Xreset Xresources Xresources.ive	\
 	Xservers Xservers.con Xservers.nc Xsession Xsession.ive	\
diff --git a/cde/programs/dtlogin/config/Xsession.src b/cde/programs/dtlogin/config/Xsession.src
index 6f550edfc..ae82c4750 100644
--- a/cde/programs/dtlogin/config/Xsession.src
+++ b/cde/programs/dtlogin/config/Xsession.src
@@ -69,7 +69,7 @@ XCOMM ##########################################################################
 #endif
 
 #ifdef linux
-#  define cpp_MAIL "/var/spool/mail/$USER"
+#  define cpp_MAIL "/var/mail/$USER"
 #  define cpp_XDIR "/usr/bin"
 #  define cpp_XINITUSER "$HOME/.xinitrc"
 #  define cpp_XDMSYS "/etc/X11/Xsession"