Commit 23f1af23 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(INSTALL_INFO): New variable.

(install-arch-indep): Don't replace the dir file if it already exists.
Use the install-info program, via INSTALL_INFO, to add entries.
Make the `info' subdir and the Info files world-readable.

(mkdir): Create the site-lisp dirs.
(install-arch-indep): Make site-lisp/subdirs files world-readable.
parent 438c2139
...@@ -174,6 +174,7 @@ docdir=@docdir@ ...@@ -174,6 +174,7 @@ docdir=@docdir@
INSTALL = @INSTALL@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_INFO = install-info
# By default, we uphold the dignity of our programs. # By default, we uphold the dignity of our programs.
INSTALL_STRIP = INSTALL_STRIP =
...@@ -341,11 +342,12 @@ install-arch-indep: mkdir ...@@ -341,11 +342,12 @@ install-arch-indep: mkdir
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \ echo " (normal-top-level-add-subdirs-to-load-path))") \
> ${datadir}/emacs/${version}/site-lisp/subdirs.el > ${datadir}/emacs/${version}/site-lisp/subdirs.el
chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el
-rm -f ${datadir}/emacs/site-lisp/subdirs.el -rm -f ${datadir}/emacs/site-lisp/subdirs.el
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ (echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \ echo " (normal-top-level-add-subdirs-to-load-path))") \
> ${datadir}/emacs/site-lisp/subdirs.el > ${datadir}/emacs/site-lisp/subdirs.el
-chmod -R a+r ${COPYDESTS} chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \ if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
then \ then \
echo "Copying etc/DOC-* to ${docdir} ..." ; \ echo "Copying etc/DOC-* to ${docdir} ..." ; \
...@@ -366,19 +368,21 @@ install-arch-indep: mkdir ...@@ -366,19 +368,21 @@ install-arch-indep: mkdir
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
then \ then \
(cd ${infodir}; \ (cd ${infodir}; \
if [ -f dir ]; then \ if [ -f dir ]; then true; \
if [ ! -f dir.old ]; then mv -f dir dir.old; \ else \
else mv -f dir dir.bak; fi; \ (cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \
chmod a+r ${infodir}/dir); \
fi; \ fi; \
cd ${srcdir}/info ; \ cd ${srcdir}/info ; \
(cd $${thisdir}; ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir); \
(cd $${thisdir}; chmod a+r ${infodir}/dir); \
for f in ccmode* cl* customize* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \ for f in ccmode* cl* customize* dired-x* ediff* emacs* forms* gnus* info* message* mh-e* reftex* sc* vip* widget*; do \
(cd $${thisdir}; \ (cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \ ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
chmod a+r ${infodir}/$$f); \ chmod a+r ${infodir}/$$f; \
${INSTALL_INFO} --info-file=$$f); \
done); \ done); \
else true; fi else true; fi
-chmod -R a+r ${COPYDESTS} ${infodir}
thisdir=`/bin/pwd`; \ thisdir=`/bin/pwd`; \
cd ${srcdir}/etc; \ cd ${srcdir}/etc; \
for page in emacs etags ctags ; do \ for page in emacs etags ctags ; do \
...@@ -405,6 +409,8 @@ install-strip: ...@@ -405,6 +409,8 @@ install-strip:
mkdir: FRC mkdir: FRC
$(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \ $(srcdir)/mkinstalldirs ${COPYDESTS} ${infodir} ${man1dir} \
${bindir} ${datadir} ${docdir} ${libexecdir} \ ${bindir} ${datadir} ${docdir} ${libexecdir} \
${datadir}/emacs/site-lisp \
${datadir}/emacs/${version}/site-lisp \
`echo ${locallisppath} | sed 's/:/ /g'` `echo ${locallisppath} | sed 's/:/ /g'`
### Delete all the installed files that the `install' target would ### Delete all the installed files that the `install' target would
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment