summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-01-13 10:21:22 +0000
committerRoy Marples <roy@marples.name>2008-01-13 10:21:22 +0000
commit7f9ea7c7c4205912dba730209a5878301f5ef492 (patch)
tree49b815f184e75ad49044e0a27e3f3e2408eb599d
parent5bf95bd3f357a75c52305e8c30c53ce4fc134e44 (diff)
downloadopenrc-7f9ea7c7c4205912dba730209a5878301f5ef492.tar.gz
openrc-7f9ea7c7c4205912dba730209a5878301f5ef492.tar.bz2
openrc-7f9ea7c7c4205912dba730209a5878301f5ef492.tar.xz
Fix PAM install
-rw-r--r--README6
-rw-r--r--src/rc/Makefile2
2 files changed, 4 insertions, 4 deletions
diff --git a/README b/README
index 935ae5f..9049299 100644
--- a/README
+++ b/README
@@ -10,9 +10,9 @@ You may wish to tweak the installation with the below arguments
PROGLDFLAGS=-static
LIBNAME=lib64
DESTDIR=/tmp/openrc-image
-PAM=pam
-TERMCAP=ncurses
-TERMCAP=termcap
+MKPAM=pam
+MKTERMCAP=ncurses
+MKTERMCAP=termcap
We don't support building a static OpenRC with PAM.
You may need to use PROGLDFLAGS=-Wl,-Bstatic on glibc instead of just -static.
diff --git a/src/rc/Makefile b/src/rc/Makefile
index d3940b7..45212e7 100644
--- a/src/rc/Makefile
+++ b/src/rc/Makefile
@@ -58,7 +58,7 @@ install: all
for x in $(RC_BINLINKS); do ln -fs ${BINDIR}/${PROG} $(DESTDIR)/${LIBNAME}/${PROG}/bin/$$x; done
${INSTALL} -d ${DESTDIR}/${LIBNAME}/${PROG}/sbin
for x in ${RC_SBINLINKS}; do ln -fs ${BINDIR}/${PROG} ${DESTDIR}/${LIBNAME}/${PROG}/sbin/$$x; done
- if test "${PAM}" = pam; then \
+ if test "${MKPAM}" = pam; then \
${INSTALL} -d ${DESTDIR}${PAMDIR}; \
${INSTALL} -m ${PAMMODE} start-stop-daemon.pam ${DESTDIR}${PAMDIR}/start-stop-daemon; \
fi