diff options
| author | Glenn Morris <rgm@gnu.org> | 2008-03-03 02:26:30 +0000 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2008-03-03 02:26:30 +0000 |
| commit | e770c0b3f50e65f23b96c8e20127169d1c9ca0f6 (patch) | |
| tree | 1a47e2c40c0a62ee5a38428db57a41751243a5c1 /Makefile.in | |
| parent | 7e0330a789f54c0dbede0cd69d059851df03c7af (diff) | |
| download | emacs-e770c0b3f50e65f23b96c8e20127169d1c9ca0f6.tar.gz | |
(iconsrcdir): New variable.
(install-etc, mkdir): Use $iconsrcdir. Handle the `scalable' icon directory.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 721883e9943..e50e8696902 100644 --- 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 @@ -575,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} ; \ @@ -603,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 ; \ |