Commit 9f1ea7dc authored by Glenn Morris's avatar Glenn Morris

Reduce some code duplication in Makefile.in

* Makefile.in (write_subdir): New.
(install-arch-indep): Use $write_subdir.
parent ac348012
2012-05-17 Glenn Morris <rgm@gnu.org>
* Makefile.in (write_subdir): New.
(install-arch-indep): Use $write_subdir.
* configure.in (docdir, etcdir, infodir, lispdir):
For a self-contained ns build, set these to the appropriate values.
* Makefile.in (install-arch-dep): No need to move info/ any more.
......
......@@ -514,6 +514,16 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
## Note that the Makefiles in the etc directory are potentially useful
## in an installed Emacs, so should not be excluded.
## Ensure that $subdir contains a subdirs.el file.
write_subdir=if [ -f $${subdir}/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
> $${subdir}/subdirs.el; \
fi; \
chmod a+r $${subdir}/subdirs.el
install-arch-indep: mkdir info install-etc
-set ${COPYDESTS} ; \
unset CDPATH; \
......@@ -553,22 +563,10 @@ install-arch-indep: mkdir info install-etc
done
-rm -f $(DESTDIR)${lispdir}/subdirs.el
$(srcdir)/update-subdirs $(DESTDIR)${lispdir}
if [ -f $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
> $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el; \
fi
chmod a+r $(DESTDIR)${datadir}/emacs/${version}/site-lisp/subdirs.el
-if [ -f $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
> $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el; \
fi
-chmod a+r $(DESTDIR)${datadir}/emacs/site-lisp/subdirs.el
subdir=$(DESTDIR)${datadir}/emacs/${version}/site-lisp ; \
${write_subdir}
subdir=$(DESTDIR)${datadir}/emacs/site-lisp ; \
${write_subdir} || true
-unset CDPATH; \
if [ `(cd ./etc; /bin/pwd)` != `(cd $(DESTDIR)${docdir}; /bin/pwd)` ]; \
then \
......
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