X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b3cdfd9e06a5647767fbbb6448da6f9039fbf787..ba3b2d88d847cf1669f3f0c340f8864c77fe59de:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 01eb409b45..bd77fa6a70 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -54,6 +54,9 @@
 # make bootstrap
 #      Removes all the compiled files to force a new bootstrap from a
 #      clean slate, and then build in the normal way.
+#
+# make docs
+#      Make Emacs documentation files from their sources; requires makeinfo.
 
 SHELL = /bin/sh
 
@@ -64,6 +67,10 @@ CDPATH=
 # If Make doesn't predefine MAKE, set it here.
 @SET_MAKE@
 
+# Prevent submakes from outputting "Entering directory ..." and
+# "Leaving directory..." diagnostics that would mess up 'make echo-info'.
+QUIET_SUBMAKE = MAKELEVEL=0
+
 # ==================== Things `configure' Might Edit ====================
 
 cache_file = @cache_file@
@@ -606,7 +613,9 @@ install-info: info
 	   [ -f dir ] || \
 	     (cd $${thisdir}; \
 	      ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
-	   info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \
+	   info_misc=`cd $${thisdir}/doc/misc && \
+		$(QUIET_SUBMAKE) $(MAKE) -s echo-info \
+	   `; \
 	   cd ${srcdir}/info ; \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
 	      test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@@ -641,6 +650,11 @@ install-man:
 	done
 
 ## Install those items from etc/ that need to end up elsewhere.
+
+## If you prefer, choose "emacs22" at installation time.
+## Note: emacs22 does not have all the resolutions.
+EMACS_ICON=emacs
+
 install-etc:
 	umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
 	tmp=etc/emacs.tmpdesktop; rm -f $${tmp}; \
@@ -655,10 +669,10 @@ install-etc:
 	for dir in */*/apps */*/mimetypes; do \
 	  [ -d $${dir} ] || continue ; \
 	  ( cd $${thisdir}; ${MKDIR_P} $(DESTDIR)${icondir}/$${dir} ) ; \
-	  for icon in $${dir}/emacs[.-]*; do \
+	  for icon in $${dir}/${EMACS_ICON}[.-]*; do \
 	    [ -r $${icon} ] || continue ; \
 	    ext=`echo "$${icon}" | sed -e 's|.*\.||'`; \
-	    dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e '$(TRANSFORM)'`.$${ext} ; \
+	    dest=`echo "$${icon}" | sed -e 's|.*/||' -e "s|\.$${ext}$$||" -e 's/$(EMACS_ICON)/emacs/' -e '$(TRANSFORM)'`.$${ext} ; \
 	    ( cd $${thisdir}; \
 	      ${INSTALL_DATA} ${iconsrcdir}/$${icon} $(DESTDIR)${icondir}/$${dir}/$${dest} ) \
 	    || exit 1; \
@@ -694,7 +708,7 @@ uninstall:
 	done
 	-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
 	thisdir=`/bin/pwd`; \
-	(info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \
+	(info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
 	 if cd $(DESTDIR)${infodir}; then \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
 	     (cd $${thisdir}; \
@@ -860,13 +874,25 @@ check:
 dist:
 	cd ${srcdir}; ./make-dist
 
+DVIS  = lispref-dvi  lispintro-dvi  emacs-dvi  misc-dvi
+HTMLS = lispref-html lispintro-html emacs-html misc-html
+INFOS = lispref-info lispintro-info emacs-info misc-info
+PDFS  = lispref-pdf  lispintro-pdf  emacs-pdf  misc-pdf
+PSS   = lispref-ps   lispintro-ps   emacs-ps # no misc-ps
+
+DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
+$(DOCS):
+	t=$@; IFS=-; set $$t; IFS=; cd doc/$$1 && $(MAKE) $(MFLAGS) $$2
+
+.PHONY: $(DOCS) docs pdf ps
 .PHONY: info dvi dist check html info-real force-info check-info-dir
 
-info-real:
-	(cd doc/emacs; $(MAKE) $(MFLAGS) info)
-	(cd doc/misc; $(MAKE) $(MFLAGS) info)
-	(cd doc/lispref; $(MAKE) $(MFLAGS) info)
-	(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+docs: $(DOCS)
+dvi: $(DVIS)
+html: $(HTMLS)
+info-real: $(INFOS)
+pdf: $(PDFS)
+ps: $(PSS)
 
 force-info:
 # Note that man/Makefile knows how to put the info files in $(srcdir),
@@ -905,12 +931,6 @@ check-info-dir: info
 	fi ; \
 	echo "info/dir is OK"
 
-dvi:
-	(cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
-	(cd doc/misc; $(MAKE) $(MFLAGS) dvi)
-	(cd doc/lispref; $(MAKE) $(MFLAGS) elisp.dvi)
-	(cd doc/lispintro; $(MAKE) $(MFLAGS) emacs-lisp-intro.dvi)
-
 #### Bootstrapping.
 
 ### This first cleans the lisp subdirectory, removing all compiled