Better error message on missing files.

[bpt/emacs.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 721883e..329ba07 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
@@ -259,8 +262,8 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
 # leim is not included because it needs special handling.
 SUBDIR = lib-src src
 
-# The makefiles of the directories in $SUBDIR.
-SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
+# The subdir makefiles created by config.status.
+SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
 
 # Subdirectories to install, and where they'll go.
 # lib-src's makefile knows how to install it, so we don't do that here.
@@ -367,6 +370,9 @@ lwlib/Makefile: $(srcdir)/lwlib/Makefile.in config.status
 leim/Makefile: $(srcdir)/leim/Makefile.in config.status
        ./config.status
 
+lisp/Makefile: $(srcdir)/lisp/Makefile.in config.status
+       ./config.status
+
 # ==================== Installation ====================
 
 ## If we let lib-src do its own installation, that means we
@@ -575,7 +581,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)/*/*/apps/*.* \
+         $(iconsrcdir)/*/*/mimetypes/*.*; do \
          if [ -r $${icon} ]; then \
            iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \
            ${INSTALL_DATA} $${icon} $${iicon} ; \
@@ -603,7 +610,7 @@ mkdir: FRC
          chmod a+r $(DESTDIR)${datadir};\
        fi
        icondirs= ; \
-       for dir in $(srcdir)/etc/images/icons/*/*x*/apps; do \
+       for dir in $(iconsrcdir)/*/*/apps $(iconsrcdir)/*/*/mimetypes; do \
          if [ -d $${dir} ]; then \
            icondirs="$${icondirs} $${dir}" ; \
          fi ; \