comparison Makefile.in @ 92420:12e9e4bb410b

(iconsrcdir): New variable. (install-etc, mkdir): Use $iconsrcdir. Handle the `scalable' icon directory.

92419:7e8a8ae7576f

# Where the etc/emacs.desktop file is to be installed.
desktopdir=$(datarootdir)/applications

# Where the etc/images/icons/hicolor directory is to be installed.
icondir=$(datarootdir)/icons

# ==================== Emacs-specific directories ====================

# These variables hold the values Emacs will actually use.  They are
# based on the values of the standard Make variables above.

## Install those items from etc/ that need to end up elsewhere.
install-etc: mkdir
	${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
	  $(DESTDIR)${desktopdir}/emacs.desktop
	for icon in $(srcdir)/etc/images/icons/*/*x*/apps/*.*; do \
	  if [ -r $${icon} ]; then \
	    iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \
	    ${INSTALL_DATA} $${icon} $${iicon} ; \
	  fi ; \
	done

	if [ -d $(DESTDIR)${datadir} ]; then true; else \
	  $(srcdir)/mkinstalldirs $(DESTDIR)${datadir}; \
	  chmod a+r $(DESTDIR)${datadir};\
	fi
	icondirs= ; \
	for dir in $(srcdir)/etc/images/icons/*/*x*/apps; do \
	  if [ -d $${dir} ]; then \
	    icondirs="$${icondirs} $${dir}" ; \
	  fi ; \
	done ; \
	icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \

92420:12e9e4bb410b

# Where the etc/emacs.desktop file is to be installed.
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
# based on the values of the standard Make variables above.

## Install those items from etc/ that need to end up elsewhere.
install-etc: mkdir
	${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
	  $(DESTDIR)${desktopdir}/emacs.desktop
	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} ; \
	  fi ; \
	done

	if [ -d $(DESTDIR)${datadir} ]; then true; else \
	  $(srcdir)/mkinstalldirs $(DESTDIR)${datadir}; \
	  chmod a+r $(DESTDIR)${datadir};\
	fi
	icondirs= ; \
	for dir in $(iconsrcdir)/*/*x*/apps $(iconsrcdir)/*/scalable/apps; do \
	  if [ -d $${dir} ]; then \
	    icondirs="$${icondirs} $${dir}" ; \
	  fi ; \
	done ; \
	icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \