Simplify install-etc rule

* Makefile.in (install-etc, mkdir):
Make relevant directories in install-etc rather than mkdir.

diff --git a/ChangeLog b/ChangeLog
index a16c7fe20416c5df351e2f77975d478d47aeb5bb..b129b6695fbf32c0278650091ad8d6251a8e2e16 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-17  Glenn Morris  <rgm@gnu.org>
 
+       * Makefile.in (install-etc, mkdir):
+       Make relevant directories in install-etc rather than mkdir.
+
        * Makefile.in (write_subdir): Create the directory if needed.
        (install-arch-dep, mkdir): No need to make site-lisp directories.
 

diff --git a/Makefile.in b/Makefile.in
index 5c76cbb500ef4b52db1c2b349377ccc0dc88123b..0649d2fee45e1711c2d762d57a08e9b2062073c4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -637,15 +637,18 @@ install-arch-indep: mkdir info install-etc
        done
 
 ## Install those items from etc/ that need to end up elsewhere.
-install-etc: mkdir
+install-etc:
+       umask 022; ${MKDIR_P} $(DESTDIR)${desktopdir}
        ${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
          $(DESTDIR)${desktopdir}/emacs.desktop
-       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} ; \
-         fi ; \
+       cd ${iconsrcdir} || exit 1; umask 022 ; \
+       for dir in */*/apps */*/mimetypes; do \
+         [ -d $${dir} ] || continue ; \
+         ${MKDIR_P} ${icondir}/$${dir} ; \
+         for icon in $${dir}/*.*; do \
+           [ -r $${icon} ] || continue ; \
+           ${INSTALL_DATA} $${icon} ${icondir}/$${icon} || exit 1 ; \
+         done ; \
        done
 
 ### Install LEIM files.  Although they are machine-independent, we
@@ -664,19 +667,11 @@ install-strip:
 ### FIXME it would be good to warn about non-standard permissions of
 ### pre-existing directories, but that does not seem easy.
 mkdir: FRC
-       icondirs= ; \
-       for dir in $(iconsrcdir)/*/*/apps $(iconsrcdir)/*/*/mimetypes; do \
-         if [ -d $${dir} ]; then \
-           icondirs="$${icondirs} $${dir}" ; \
-         fi ; \
-       done ; \
-       icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \
        umask 022 ; \
        $(MKDIR_P) $(DESTDIR)${datadir} ${COPYDESTS} \
          $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \
          $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
-         $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \
-         $(DESTDIR)${desktopdir} $${icondirs}
+         $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
 
 ### Delete all the installed files that the `install' target would
 ### create (but not the noninstalled files such as `make all' would create).