[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: |
Sat, 05 Jan 2008 04:15:00 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/01/05 04:15:00
Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -b -r1.335 -r1.336
--- Makefile.in 3 Dec 2007 06:54:19 -0000 1.335
+++ Makefile.in 5 Jan 2008 04:14:59 -0000 1.336
@@ -170,6 +170,12 @@
# Location to install Emacs.app on Mac OS X
address@hidden@
+# 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
@@ -429,7 +435,7 @@
## Nuisance because i) it needs to be the user running install, so
## configure can't set it; ii) can't (?) use the result of rule
## commands to set make variables.
-install-arch-indep: mkdir info
+install-arch-indep: mkdir info install-etc
-set ${COPYDESTS} ; \
unset CDPATH; \
for dir in ${COPYDIR} ; do \
@@ -571,6 +577,17 @@
chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \
done
+## 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
+
### Install LEIM files. Although they are machine-independent, we
### have separate target here instead of including it in
### `install-arch-indep'. People who extracted LEIM files after they
@@ -591,11 +608,19 @@
$(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'` ; \
$(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir}
$(DESTDIR)${man1dir} \
$(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \
$(DESTDIR)${datadir}/emacs/site-lisp \
$(DESTDIR)${datadir}/emacs/${version}/site-lisp \
- $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'`
+ $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \
+ $(DESTDIR)${desktopdir} $${icondirs}
### Delete all the installed files that the `install' target would
### create (but not the noninstalled files such as `make all' would
- [Emacs-diffs] Changes to emacs/Makefile.in,v,
Glenn Morris <=