[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/Makefile.in,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/Makefile.in,v |
Date: |
Mon, 03 Mar 2008 02:26:30 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/03/03 02:26:30
Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -b -r1.341 -r1.342
--- Makefile.in 21 Feb 2008 09:04:22 -0000 1.341
+++ Makefile.in 3 Mar 2008 02:26:30 -0000 1.342
@@ -177,6 +177,9 @@
# 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-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 @@
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 ; \
- [Emacs-diffs] Changes to emacs/Makefile.in,v,
Glenn Morris <=