aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1994-05-04 05:15:00 +0000
committerRichard M. Stallman1994-05-04 05:15:00 +0000
commitd19f95fe166eb05945c977ec89e3cae3a3158d76 (patch)
treeb5cedcee83306168a0faec1f6412faaaafdb6b86
parentc2079f0a5d316b7554285d69f9b18f4fae02ea28 (diff)
downloademacs-d19f95fe166eb05945c977ec89e3cae3a3158d76.tar.gz
emacs-d19f95fe166eb05945c977ec89e3cae3a3158d76.zip
(maybe-blessmail): New target to print the blessmail warning message.
(${archlibdir}): Don't do it here. Don't depend on blessmail.
-rw-r--r--lib-src/Makefile.in24
1 files changed, 13 insertions, 11 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index da5e40e9134..0db8313d41d 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -164,9 +164,21 @@ blessmail: ../src/emacs
164 chmod +x blessmail 164 chmod +x blessmail
165#endif 165#endif
166 166
167maybe-blessmail: BLESSMAIL
168#ifdef MOVEMAIL_NEEDS_BLESSING
169/* Don't charge ahead and do it! Let the installer decide.
170 ./blessmail ${archlibdir}/movemail */
171 @if [ `wc -l <blessmail` != 2 ] ; then \
172 dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
173 echo Assuming $$dir is really the mail spool directory, you should; \
174 echo run ./blessmail ${archlibdir}/movemail; \
175 echo as root, to give movemail appropriate permissions.; \
176 fi
177#endif
178
167/* Install the internal utilities. Until they are installed, we can 179/* Install the internal utilities. Until they are installed, we can
168 just run them directly from lib-src. */ 180 just run them directly from lib-src. */
169${archlibdir}: all BLESSMAIL 181${archlibdir}: all
170 @echo 182 @echo
171 @echo "Installing utilities run internally by Emacs." 183 @echo "Installing utilities run internally by Emacs."
172 ./make-path ${archlibdir} 184 ./make-path ${archlibdir}
@@ -178,16 +190,6 @@ ${archlibdir}: all BLESSMAIL
178 (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file); \ 190 (cd ..; $(INSTALL_PROGRAM) ${srcdir}/$$file ${archlibdir}/$$file); \
179 done ; \ 191 done ; \
180 fi 192 fi
181#ifdef MOVEMAIL_NEEDS_BLESSING
182/* Don't charge ahead and do it! Let the installer decide.
183 ./blessmail ${archlibdir}/movemail */
184 @if [ `wc -l <blessmail` != 2 ] ; then \
185 dir=`sed -n -e 's/echo mail directory = \(.*\)/\1/p' blessmail`; \
186 echo Assuming $$dir is really the mail spool directory, you should; \
187 echo run ./blessmail ${archlibdir}/movemail; \
188 echo as root, to give movemail appropriate permissions.; \
189 fi
190#endif
191 193
192/* We don't need to install `wakeup' explicitly, because it will be 194/* We don't need to install `wakeup' explicitly, because it will be
193 copied when this whole directory is copied. */ 195 copied when this whole directory is copied. */