diff --git a/cde/programs/dtcm/dtcm/Makefile.am b/cde/programs/dtcm/dtcm/Makefile.am
index 0b24f3f7f..f2e6dd0a1 100644
--- a/cde/programs/dtcm/dtcm/Makefile.am
+++ b/cde/programs/dtcm/dtcm/Makefile.am
@@ -46,4 +46,4 @@ dtcm_editor_SOURCES = datefield.c     deskset.c       dssw.c \
 		      reminders.c     rfp.c
 
 install-exec-hook:
-	mkdir -p $(DESTDIR)/var/spool/calendar
+	$(INSTALL) -m 0755 -d $(DESTDIR)/var/spool/calendar
diff --git a/cde/programs/dtmail/dtmail/Makefile.am b/cde/programs/dtmail/dtmail/Makefile.am
index 78975dea8..6faf282cb 100644
--- a/cde/programs/dtmail/dtmail/Makefile.am
+++ b/cde/programs/dtmail/dtmail/Makefile.am
@@ -8,34 +8,7 @@ dtmail_CXXFLAGS = -I../include -I../include/MotifApp -I../include/utils \
 		  -DDTMAIL_TOOLTALK -DDTEDITOR
 
 dtmail_LDADD = ../libDtMail/libDtMail.a ../MotifApp/libMotifApp.a -lXm \
-		@DTCLIENTLIBS@ $(XTOOLLIB) $(TIRPCLIB)
-
-# FIXME solaris....
-#if SOLARIS
-#dtmail_LDFLAGS = -lw
-#if SUNPRODIR
-#SUNPRO_DIR = SUNPRODIR
-#else
-#SUNPRO_DIR = /opt/SUNWspro
-#endif
-#C++LIBPATH = -L$(SUNPRO_DIR)/lib
-#
-#if USE_SPRO_V3
-#SPRO_V3_OPTIONS =      -noex -USPRO_V2
-#if DEBUGTREE
-#3SPRO_V3_OPTIONS +=      -xsb
-#endif
-#else
-#EXTRA_CCOPTIONS +=      -DSPRO_V2
-#endif
-#
-#EXTRA_C++OPTIONS = -xF +w $(SPRO_V3_OPTIONS)
-#EXTRA_CCOPTIONS = -xF -xstrconst -Xa -v
-#if USE_EDITRES
-#EXTRA_LIBRARIES = $(XMULIB) ExtraLibraries
-#endif
-#endif SOLARIS
-
+		$(DTCLIENTLIBS) $(XTOOLLIB) $(TIRPCLIB)
 
 dtmail_SOURCES = AliasListUiItem.C               AlternatesListUiItem.C \
 		 AntiCheckBoxUiItem.C            AttachArea.C \
@@ -71,7 +44,7 @@ dtmail_SOURCES = AliasListUiItem.C               AlternatesListUiItem.C \
 		 dtb_utils.C                     options_stubs.C \
 		 options_ui.C                    options_util.C
 
+# can't use INSTALL here as the file is already installed
 install-exec-hook:
-	chown root $(DESTDIR)$(bindir)/dtmail
 	chgrp mail $(DESTDIR)$(bindir)/dtmail
 	chmod 2755 $(DESTDIR)$(bindir)/dtmail
diff --git a/cde/programs/dtsearchpath/dtappg/Makefile.am b/cde/programs/dtsearchpath/dtappg/Makefile.am
index d5321335a..915c76af3 100644
--- a/cde/programs/dtsearchpath/dtappg/Makefile.am
+++ b/cde/programs/dtsearchpath/dtappg/Makefile.am
@@ -12,6 +12,7 @@ endif
 
 dtappgather_SOURCES = Options.C dtappgather.C dtappgather.h Options.h
 
+# can't use INSTALL here as the program is already installed
 install-exec-hook:
 	chown root $(DESTDIR)$(bindir)/dtappgather
 	chmod 4755 $(DESTDIR)$(bindir)/dtappgather
diff --git a/cde/programs/dtsession/Makefile.am b/cde/programs/dtsession/Makefile.am
index 0bd35b5df..d9de35a77 100644
--- a/cde/programs/dtsession/Makefile.am
+++ b/cde/programs/dtsession/Makefile.am
@@ -131,10 +131,10 @@ sys.session.ive: sys.session.src
 # systems without a PAM library need dtsession to be SUID root
 
 install-exec-hook:
-	chown root $(DESTDIR)$(bindir)/dtsession
 if HAS_PAM_LIBRARY
 	chmod 755 $(DESTDIR)$(bindir)/dtsession
 else
+	chown root $(DESTDIR)$(bindir)/dtsession
 	chmod 4755 $(DESTDIR)$(bindir)/dtsession
 endif