summaryrefslogtreecommitdiff
path: root/lib-src/Makefile.in
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-05-01 06:43:34 +0000
committerRichard M. Stallman <rms@gnu.org>1994-05-01 06:43:34 +0000
commit89eb24b3e4434e526d0418fb2d43d3fb2a0cdbca (patch)
tree5f8af45614c970918e4a9f3e947dafc5fa54668c /lib-src/Makefile.in
parentc44411943f8b5c9e4508af8e20f0c4717bf3f638 (diff)
downloademacs-89eb24b3e4434e526d0418fb2d43d3fb2a0cdbca.tar.gz
(${archlibdir}): Don't run blessmail; instead
print advice to run it, if it has anything significant to do. And only if MOVEMAIL_NEEDS_BLESSING. (blessmail): Use emacs, not temacs. (configuration): Renamed from configname.
Diffstat (limited to 'lib-src/Makefile.in')
-rw-r--r--lib-src/Makefile.in15
1 files changed, 11 insertions, 4 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 94cb500bfff..bd1b0be4d44 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -65,7 +65,7 @@ ALLOCA=@ALLOCA@
LOADLIBES=LIBS_SYSTEM LIBS_MACHINE
YACC=@YACC@
version=@version@
-configname=@configuration@
+configuration=@configuration@
/* ==================== Where To Install Things ==================== */
@@ -159,8 +159,8 @@ CPP_CFLAGS = C_SWITCH_SYSTEM C_SWITCH_MACHINE -Demacs -DHAVE_CONFIG_H \
all: ${UTILITIES} ${INSTALLABLES}
#ifdef MOVEMAIL_NEEDS_BLESSING
-blessmail: ../src/temacs
- ../src/temacs -batch -l blessmail.el
+blessmail: ../src/emacs
+ ../src/emacs -batch -l blessmail.el
chmod +x blessmail
#endif
@@ -179,7 +179,14 @@ ${archlibdir}: all BLESSMAIL
done ; \
fi
#ifdef MOVEMAIL_NEEDS_BLESSING
- ./blessmail ${archlibdir}/movemail
+/* Don't charge ahead and do it! Let the installer decide.
+ ./blessmail ${archlibdir}/movemail */
+ @if [ "`wc -l blessmail`" != " 2 blessmail" ] ; then \
+ dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
+ echo Assuming $$dir is really the mail spool directory, you should; \
+ echo run ./blessmail ${archlibdir}/movemail; \
+ echo as root, to make movemail setuid or setgid.; \
+ fi
#endif
/* We don't need to install `wakeup' explicitly, because it will be