rework pam, ncurses and termcap include files
This allows error checking inside the included files instead of either including the appropriate file or a blank file. Also the blank file named .mk gets removed by this change.
This commit is contained in:
parent
a2e9cde737
commit
db6d680765
@ -1,3 +0,0 @@
|
|||||||
LIBTERMCAP?= -lncurses
|
|
||||||
CPPFLAGS+= -DHAVE_TERMCAP
|
|
||||||
LDADD+= ${LIBTERMCAP}
|
|
@ -1,6 +1,10 @@
|
|||||||
|
ifeq (${MKPAM},pam)
|
||||||
LIBPAM?= -lpam
|
LIBPAM?= -lpam
|
||||||
CPPFLAGS+= -DHAVE_PAM
|
CPPFLAGS+= -DHAVE_PAM
|
||||||
LDADD+= ${LIBPAM}
|
LDADD+= ${LIBPAM}
|
||||||
|
|
||||||
PAMDIR?= /etc/pam.d
|
PAMDIR?= /etc/pam.d
|
||||||
PAMMODE?= 0644
|
PAMMODE?= 0644
|
||||||
|
else ifneq (${MKPAM},)
|
||||||
|
$(error if MKPAM is defined, it must be "pam")
|
||||||
|
endif
|
||||||
|
@ -1,3 +1,11 @@
|
|||||||
|
ifeq (${MKTERMCAP},ncurses)
|
||||||
|
LIBTERMCAP?= -lncurses
|
||||||
|
CPPFLAGS+= -DHAVE_TERMCAP
|
||||||
|
LDADD+= ${LIBTERMCAP}
|
||||||
|
else ifeq (${MKTERMCAP},termcap)
|
||||||
LIBTERMCAP?= -ltermcap
|
LIBTERMCAP?= -ltermcap
|
||||||
CPPFLAGS+= -DHAVE_TERMCAP
|
CPPFLAGS+= -DHAVE_TERMCAP
|
||||||
LDADD+= ${LIBTERMCAP}
|
LDADD+= ${LIBTERMCAP}
|
||||||
|
else ifneq (${MKTERMCAP},)
|
||||||
|
$(error If MKTERMCAP is defined, it must be ncurses or termcap)
|
||||||
|
endif
|
||||||
|
@ -10,4 +10,4 @@ MK= ../../mk
|
|||||||
include ${MK}/lib.mk
|
include ${MK}/lib.mk
|
||||||
include ${MK}/cc.mk
|
include ${MK}/cc.mk
|
||||||
include ${MK}/debug.mk
|
include ${MK}/debug.mk
|
||||||
include ${MK}/${MKTERMCAP}.mk
|
include ${MK}/termcap.mk
|
||||||
|
@ -41,9 +41,9 @@ include ${MK}/prog.mk
|
|||||||
include ${MK}/git.mk
|
include ${MK}/git.mk
|
||||||
include ${MK}/cc.mk
|
include ${MK}/cc.mk
|
||||||
|
|
||||||
include ${MK}/${MKTERMCAP}.mk
|
include ${MK}/termcap.mk
|
||||||
LDADD+= ${LIBDL} ${LIBKVM}
|
LDADD+= ${LIBDL} ${LIBKVM}
|
||||||
include ${MK}/${MKPAM}.mk
|
include ${MK}/pam.mk
|
||||||
|
|
||||||
# create symlinks to rc if not an SELINUX system, otherwise create a wrapper
|
# create symlinks to rc if not an SELINUX system, otherwise create a wrapper
|
||||||
# script to call rc with the proper name of the applet to execute.
|
# script to call rc with the proper name of the applet to execute.
|
||||||
|
Loading…
Reference in New Issue
Block a user