diff --git a/cde/programs/dtlogin/config/Makefile.am b/cde/programs/dtlogin/config/Makefile.am
index c7dc5087d..faa7fb5c9 100644
--- a/cde/programs/dtlogin/config/Makefile.am
+++ b/cde/programs/dtlogin/config/Makefile.am
@@ -43,11 +43,11 @@ CLEANFILES = $(CPP_TARGETS)
 # programs/localization/
 
 configsdir=$(CDE_INSTALLATION_TOP)/config
-dist_configs_DATA = Xaccess Xconfig Xfailsafe Xreset Xservers Xsetup \
-	Xstartup sys.dtprofile
+dist_configs_DATA = Xaccess Xconfig Xfailsafe Xservers
+dist_configs_SCRIPTS = sys.dtprofile Xfailsafe Xreset Xsetup Xstartup
 
 xsessdir=$(CDE_INSTALLATION_TOP)/config/Xsession.d
-dist_xsess_DATA = 0060.dtsysenv
+dist_xsess_SCRIPTS = 0060.dtsysenv
 
 dist_bin_SCRIPTS = Xsession
 
diff --git a/cde/programs/dtsearchpath/Makefile.am b/cde/programs/dtsearchpath/Makefile.am
index 34b7f1165..64deaaa75 100644
--- a/cde/programs/dtsearchpath/Makefile.am
+++ b/cde/programs/dtsearchpath/Makefile.am
@@ -6,7 +6,7 @@ BUILT_SOURCES = 0010.dtpaths 0030.dttmpdir
 CLEANFILES = $(BUILT_SOURCES)
 
 cfgdir = $(CDE_INSTALLATION_TOP)/config/Xsession.d
-dist_cfg_DATA = 0010.dtpaths 0030.dttmpdir
+dist_cfg_SCRIPTS = 0010.dtpaths 0030.dttmpdir
 
 LOCAL_CPP_DEFINES = -DCDE_INSTALLATION_TOP=$(CDE_INSTALLATION_TOP)	\
 	-DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP)		\
diff --git a/cde/programs/dtsession/Makefile.am b/cde/programs/dtsession/Makefile.am
index 5c495040f..be34e5c09 100644
--- a/cde/programs/dtsession/Makefile.am
+++ b/cde/programs/dtsession/Makefile.am
@@ -20,7 +20,7 @@ dtsession_SOURCES = SmMain.c SmHelp.c SmGlobals.c SmCommun.c		\
 	SmMigResources.h SmSave.h SmXrm.h
 
 
-dtsession_LDADD = @DTCLIENTLIBS@ -lXm $(TIRPCLIB) $(XTOOLLIB)
+dtsession_LDADD = $(DTCLIENTLIBS) $(XTOOLLIB)
 
 if SOLARIS
 dtsession_SOURCES += OWsync.c
@@ -51,6 +51,31 @@ LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
 		    -DDTSM_CMD4="\"$(DTSM_CMD4)\"" \
 		    -DDTSM_CMD5="\"$(DTSM_CMD5)\""
 
+if LINUX
+LOCAL_CPP_DEFINES += -Dlinux -D__linux__
+endif
+
+if FREEBSD
+LOCAL_CPP_DEFINES += -DFREEBSD -D__FreeBSD__
+endif
+
+if SOLARIS
+LOCAL_CPP_DEFINES += -Dsun
+endif
+
+if OPENBSD
+LOCAL_CPP_DEFINES += -D__OpenBSD__
+endif
+
+if NETBSD
+LOCAL_CPP_DEFINES += -D__NetBSD__
+endif
+
+if BSD
+LOCAL_CPP_DEFINES += -DCSRG_BASED
+endif
+
+
 BUILT_SOURCES = Dtsession dtloadresources dtsession.msg sys.font	\
 	sys.resources sys.resources.ive sys.session sys.session.ive
 CLEANFILES = $(BUILT_SOURCES)