X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/430d2ee2919b2d4693780f2474ba40148442d206..7ea27e3247dc1b8a56f373084521445ba8ebe4cc:/Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 5f804542d4..e50e869690 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -140,10 +140,10 @@ man1dir=$(mandir)/man1
 # system, it is inappropriate to imply that it is part of Emacs.
 infodir=@infodir@
 INFO_FILES=ada-mode autotype calc ccmode cl dbus dired-x ebrowse ediff	\
-           efaq eintr elisp emacs emacs-mime erc eshell eudc flymake	\
-           forms gnus idlwave info message mh-e newsticker nxml-mode	\
-           org pcl-cvs pgg rcirc reftex remember sc ses sieve speedbar	\
-           tramp vip viper widget woman smtpmail url
+           efaq eintr elisp emacs emacs-mime epa erc eshell eudc	\
+           flymake forms gnus idlwave info message mh-e newsticker	\
+           nxml-mode org pcl-cvs pgg rcirc reftex remember sc ses sieve	\
+           speedbar tramp vip viper widget woman smtpmail url
 
 # Directory for local state files for all programs.
 localstatedir=@localstatedir@
@@ -177,6 +177,9 @@ desktopdir=$(datarootdir)/applications
 # Where the etc/images/icons/hicolor directory is to be installed.
 icondir=$(datarootdir)/icons
 
+# The source directory for the icon files.
+iconsrcdir=$(srcdir)/etc/images/icons
+
 # ==================== Emacs-specific directories ====================
 
 # These variables hold the values Emacs will actually use.  They are
@@ -414,6 +417,13 @@ install-arch-dep: mkdir
 			&& cat > /dev/null))) || exit 1; \
 	fi
 
+## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
+## Needs to be the user running install, so configure can't set it.
+set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
+	  `id -un 2> /dev/null`; do \
+	  [ -n "$${installuser}" ] && break ; \
+	done
+
 ### Install the files that are machine-independent.
 ### Most of them come straight from the distribution;
 ### the exception is the DOC-* files, which are copied
@@ -431,11 +441,6 @@ install-arch-dep: mkdir
 ## Note that the Makefiles in the etc directory are potentially useful
 ## in an installed Emacs, so should not be excluded.
 
-## installuser:
-## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html
-## Nuisance because i) it needs to be the user running install, so
-## configure can't set it; ii) can't (?) use the result of rule
-## commands to set make variables.
 install-arch-indep: mkdir info install-etc
 	-set ${COPYDESTS} ; \
 	unset CDPATH; \
@@ -449,10 +454,7 @@ install-arch-indep: mkdir info install-etc
 	mkdir ${COPYDESTS} ; \
 	chmod ugo+rx ${COPYDESTS} ; \
 	unset CDPATH; \
-	for installuser in $${LOGNAME} $${USERNAME} $${USER} \
-	  `id -un 2> /dev/null`; do \
-	  [ -n "$${installuser}" ] && break ; \
-	done ; \
+	$(set_installuser); \
 	for dir in ${COPYDIR} ; do \
 	  dest=$$1 ; shift ; \
 	  [ -d $${dir} ] \
@@ -510,10 +512,7 @@ install-arch-indep: mkdir info install-etc
 	   (cd ./etc; tar -chf - $${docfile}) \
 	     |(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
 	   (cd $(DESTDIR)$(docdir); \
-	    for installuser in $${LOGNAME} $${USERNAME} $${USER} \
-	      `id -un 2> /dev/null`; do \
-	       [ -n "$${installuser}" ] && break ; \
-	    done ; \
+	    $(set_installuser); \
 	    chown $${installuser} DOC*; chmod a+r DOC*; \
 	    if test "`echo DOC-*`" != "DOC-*"; then rm -f DOC; fi); \
 	else true; fi
@@ -527,10 +526,7 @@ install-arch-indep: mkdir info install-etc
 	   (cd lisp; tar -chf - *.el *.elc) \
 	     |(cd $(DESTDIR)${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
 	   (cd $(DESTDIR)${lispdir}; \
-	    for installuser in $${LOGNAME} $${USERNAME} $${USER} \
-	      `id -un 2> /dev/null`; do \
-	       [ -n "$${installuser}" ] && break ; \
-	    done ; \
+	    $(set_installuser); \
 	    find . -exec chown $${installuser} {} ';') ; \
 	else true; fi
 	-unset CDPATH; \
@@ -582,7 +578,8 @@ install-arch-indep: mkdir info install-etc
 install-etc: mkdir
 	${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
 	  $(DESTDIR)${desktopdir}/emacs.desktop
-	for icon in $(srcdir)/etc/images/icons/*/*x*/apps/*.*; do \
+	for icon in $(iconsrcdir)/*/*x*/apps/*.* \
+	  $(iconsrcdir)/*/scalable/apps/*.*; do \
 	  if [ -r $${icon} ]; then \
 	    iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \
 	    ${INSTALL_DATA} $${icon} $${iicon} ; \
@@ -610,7 +607,7 @@ mkdir: FRC
 	  chmod a+r $(DESTDIR)${datadir};\
 	fi
 	icondirs= ; \
-	for dir in $(srcdir)/etc/images/icons/*/*x*/apps; do \
+	for dir in $(iconsrcdir)/*/*x*/apps $(iconsrcdir)/*/scalable/apps; do \
 	  if [ -d $${dir} ]; then \
 	    icondirs="$${icondirs} $${dir}" ; \
 	  fi ; \
@@ -779,6 +776,24 @@ info: force-info
 	-(cd doc/misc; $(MAKE) $(MFLAGS) info)
 	-(cd doc/lispref; $(MAKE) $(MFLAGS) info)
 	-(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+
+# The info/dir file must be updated by hand when new manuals are added.
+check-info-dir: info
+	cd info ; \
+	missing= ; \
+	for file in *; do \
+	  test -f "$${file}" || continue ; \
+	  case $${file} in \
+	    *-[0-9]*|COPYING|dir) continue ;; \
+	  esac ; \
+	  grep -q -F ": ($${file})." dir || missing="$${missing} $${file}" ; \
+	done ; \
+	if test -n "$${missing}"; then \
+	  echo "Missing info/dir entries: $${missing}" ; \
+	  exit 1 ; \
+	fi ; \
+	echo "info/dir is OK"
+
 dvi:
 	(cd doc/emacs; $(MAKE) $(MFLAGS) dvi)
 	(cd doc/misc; $(MAKE) $(MFLAGS) dvi)
@@ -802,7 +817,6 @@ maybe_bootstrap:
 	if [ \( "$$bar" = '$(srcdir)/lisp/*.elc' \) -o \( "$$bar" = '' \) ]; then \
 	  echo "Your tree does not include the compiled Lisp files."; \
 	  echo "You need to do \`make bootstrap' to build Emacs."; \
-	  echo "Emacs now requires Texinfo version 4.2."; \
 	  exit 1;\
 	fi