1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-03-09 15:50:02 +00:00

autotools: install PAM configuration files directly instead of by

using the setup script.
This commit is contained in:
Liang Chang 2021-11-22 05:50:51 +08:00
parent dd17c6a394
commit c8762bcb01
5 changed files with 34 additions and 43 deletions

View file

@ -13,15 +13,28 @@ CPP_TARGETS = 0060.dtsysenv Dtlogin Xaccess Xconfig Xconfig.con \
if HAS_PAM_LIBRARY
CPP_TARGETS += pam/dtlogin
dist_pam_DATA = pam/dtlogin
if FREEBSD
pamdir = /usr/local/etc/pam.d
PAM_AUTHENTICATION_MODULE = /usr/local/lib/security/pam_pwauth_suid.so
AM_CPPFLAGS += -DPAM_AUTHENTICATION_MODULE=$(PAM_AUTHENTICATION_MODULE)
else
pamdir = /etc/pam.d
if NETBSD
PAM_AUTHENTICATION_MODULE = /usr/pkg/lib/security/pam_pwauth_suid.so
AM_CPPFLAGS += -DPAM_AUTHENTICATION_MODULE=$(PAM_AUTHENTICATION_MODULE)
endif
endif
endif
if LINUX
AM_CPPFLAGS += -DXPROJECTROOT="/usr" -Dlinux -D__linux__
endif
if FREEBSD
AM_CPPFLAGS += -DFREEBSD -DXPROJECTROOT="/usr/local" -D__FreeBSD__
PAM_AUTHENTICATION_MODULE = /usr/local/lib/security/pam_pwauth_suid.so
AM_CPPFLAGS += -DPAM_AUTHENTICATION_MODULE=$(PAM_AUTHENTICATION_MODULE)
CPP_TARGETS += pam.d.dtlogin
endif
if SOLARIS
@ -34,9 +47,6 @@ endif
if NETBSD
AM_CPPFLAGS += -DXPROJECTROOT="/usr/X11R7" -D__NetBSD__
PAM_AUTHENTICATION_MODULE = /usr/pkg/lib/security/pam_pwauth_suid.so
AM_CPPFLAGS += -DPAM_AUTHENTICATION_MODULE=$(PAM_AUTHENTICATION_MODULE)
CPP_TARGETS += pam.d.dtlogin
endif
if BSD
@ -156,7 +166,7 @@ home.session: home.session.src
$(RM) $@
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@
pam.d.dtlogin: pam.d.dtlogin.src
pam/dtlogin: pam/dtlogin.src
$(RM) $@
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@

View file

@ -80,23 +80,3 @@ fi
fi
fi
#endif
#ifdef HAS_PAM_LIBRARY
#ifdef __FreeBSD__
#define PAM_D /usr/local/etc/pam.d
#else
#define PAM_D /etc/pam.d
#endif
for i in CDE_INSTALLATION_TOP/config/pam.d.*
do
conf=PAM_D/${i##*.}
if [ ! -f $conf ]; then
if [ -f $i ]; then
/bin/cp $i $conf
/bin/chmod 644 $conf
fi
fi
done
#endif

View file

@ -1,23 +1,24 @@
MAINTAINERCLEANFILES = Makefile.in
CPP_TARGET = pam.d.dtsession
if HAS_PAM_LIBRARY
CPP_TARGET = pam/dtsession
dist_pam_DATA = $(CPP_TARGET)
if FREEBSD
pamdir = /usr/local/etc/pam.d
PAM_AUTHENTICATION_MODULE = /usr/local/lib/security/pam_pwauth_suid.so
AM_CPPFLAGS = -DPAM_AUTHENTICATION_MODULE=$(PAM_AUTHENTICATION_MODULE)
else
pamdir = /etc/pam.d
if NETBSD
PAM_AUTHENTICATION_MODULE = /usr/pkg/lib/security/pam_pwauth_suid.so
AM_CPPFLAGS = -DPAM_AUTHENTICATION_MODULE=$(PAM_AUTHENTICATION_MODULE)
endif
endif
endif
BUILT_SOURCES = $(CPP_TARGET)
CLEANFILES = $(CPP_TARGET)
cfgdir = $(CDE_INSTALLATION_TOP)/config
dist_cfg_DATA = $(CPP_TARGET)
if FREEBSD
PAM_AUTHENTICATION_MODULE = /usr/local/lib/security/pam_pwauth_suid.so
endif
if NETBSD
PAM_AUTHENTICATION_MODULE = /usr/pkg/lib/security/pam_pwauth_suid.so
endif
pam.d.dtsession: pam.d.dtsession.src
pam/dtsession: pam/dtsession.src
$(RM) $@
$(GENCPP) -P -DXCOMM=# -DPAM_AUTHENTICATION_MODULE=$(PAM_AUTHENTICATION_MODULE) $< > $@
$(GENCPP) -P -DXCOMM=# $(AM_CPPFLAGS) $< > $@