From 41dbfddc10098f28bfae72b08089b478b99346a3 Mon Sep 17 00:00:00 2001
From: Jon Trulson <jon@radscan.com>
Date: Mon, 22 Nov 2021 13:15:01 -0700
Subject: [PATCH] dtsession/Makefile.am: add config to SUBDIR so PAM config is
 built/installed

Also, update .gitignore due to some renaming of the PAM config files.
---
 cde/.gitignore                     | 4 ++--
 cde/programs/dtsession/Makefile.am | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/cde/.gitignore b/cde/.gitignore
index fae073453..4c1c9d57a 100644
--- a/cde/.gitignore
+++ b/cde/.gitignore
@@ -168,6 +168,7 @@ programs/dtimsstart/dtimsstart
 programs/dtlogin/dtchooser
 programs/dtlogin/dtgreet
 programs/dtlogin/dtlogin
+programs/dtlogin/config/pam/dtlogin
 programs/dtmail/dtmail/dtmail
 programs/dtmail/dtmailpr/dtmailpr
 programs/dtpad/dtpad
@@ -184,7 +185,7 @@ programs/dtsession/Dtsession
 programs/dtsession/dtloadresources
 programs/dtsession/dtsession
 programs/dtsession/dtsession_res
-programs/dtsession/config/pam.d.dtsession
+programs/dtsession/config/pam/dtsession
 programs/dtspcd/dtspcd
 programs/dtspcd/dtspcdenv
 programs/dtsr/dtsrclean
@@ -965,7 +966,6 @@ programs/dtlogin/config/display.home.session
 programs/dtlogin/config/dtlslocale
 programs/dtlogin/config/dtprofile
 programs/dtlogin/config/home.session
-programs/dtlogin/config/pam.d.dtlogin
 
 # programs/dtprintinfo
 programs/dtprintinfo/dtprintinfo.msg
diff --git a/cde/programs/dtsession/Makefile.am b/cde/programs/dtsession/Makefile.am
index e8afb0265..0bd35b5df 100644
--- a/cde/programs/dtsession/Makefile.am
+++ b/cde/programs/dtsession/Makefile.am
@@ -57,7 +57,7 @@ LOCAL_CPP_DEFINES = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
 		    -DDTSM_CMD4="\"$(DTSM_CMD4)\"" \
 		    -DDTSM_CMD5="\"$(DTSM_CMD5)\""
 
-SUBDIRS =
+SUBDIRS = config
 
 if LINUX
 LOCAL_CPP_DEFINES += -Dlinux -D__linux__