Mercurial > emacs
comparison Makefile.in @ 87588:32e91443c003
(desktopdir, icondir): New variables.
(install-arch-indep): Also depend on `install-etc'.
(install-etc): New target.
(mkdir): Also create the `applications' and `icons' directories.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 05 Jan 2008 04:14:59 +0000 |
| parents | ce6a9097341e |
| children | 107ccd98fa12 |
comparison
equal
deleted
inserted
replaced
| 87587:546180f9602b | 87588:32e91443c003 |
|---|---|
| 168 x_default_search_path=@x_default_search_path@ | 168 x_default_search_path=@x_default_search_path@ |
| 169 | 169 |
| 170 # Location to install Emacs.app on Mac OS X | 170 # Location to install Emacs.app on Mac OS X |
| 171 carbon_appdir=@carbon_appdir@ | 171 carbon_appdir=@carbon_appdir@ |
| 172 | 172 |
| 173 # Where the etc/emacs.desktop file is to be installed. | |
| 174 desktopdir=$(datarootdir)/applications | |
| 175 | |
| 176 # Where the etc/images/icons/hicolor directory is to be installed. | |
| 177 icondir=$(datarootdir)/icons | |
| 178 | |
| 173 # ==================== Emacs-specific directories ==================== | 179 # ==================== Emacs-specific directories ==================== |
| 174 | 180 |
| 175 # These variables hold the values Emacs will actually use. They are | 181 # These variables hold the values Emacs will actually use. They are |
| 176 # based on the values of the standard Make variables above. | 182 # based on the values of the standard Make variables above. |
| 177 | 183 |
| 427 ## installuser: | 433 ## installuser: |
| 428 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html | 434 ## http://lists.gnu.org/archive/html/emacs-devel/2007-10/msg01672.html |
| 429 ## Nuisance because i) it needs to be the user running install, so | 435 ## Nuisance because i) it needs to be the user running install, so |
| 430 ## configure can't set it; ii) can't (?) use the result of rule | 436 ## configure can't set it; ii) can't (?) use the result of rule |
| 431 ## commands to set make variables. | 437 ## commands to set make variables. |
| 432 install-arch-indep: mkdir info | 438 install-arch-indep: mkdir info install-etc |
| 433 -set ${COPYDESTS} ; \ | 439 -set ${COPYDESTS} ; \ |
| 434 unset CDPATH; \ | 440 unset CDPATH; \ |
| 435 for dir in ${COPYDIR} ; do \ | 441 for dir in ${COPYDIR} ; do \ |
| 436 if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ | 442 if [ `(cd $$1 && /bin/pwd)` != `(cd $${dir} && /bin/pwd)` ] ; then \ |
| 437 rm -rf $$1 ; \ | 443 rm -rf $$1 ; \ |
| 569 (cd $${thisdir}; \ | 575 (cd $${thisdir}; \ |
| 570 ${INSTALL_DATA} ${mansrcdir}/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \ | 576 ${INSTALL_DATA} ${mansrcdir}/$${page}.1 $(DESTDIR)${man1dir}/$${page}${manext}; \ |
| 571 chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \ | 577 chmod a+r $(DESTDIR)${man1dir}/$${page}${manext}); \ |
| 572 done | 578 done |
| 573 | 579 |
| 580 ## Install those items from etc/ that need to end up elsewhere. | |
| 581 install-etc: mkdir | |
| 582 ${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \ | |
| 583 $(DESTDIR)${desktopdir}/emacs.desktop | |
| 584 for icon in $(srcdir)/etc/images/icons/*/*x*/apps/*.*; do \ | |
| 585 if [ -r $${icon} ]; then \ | |
| 586 iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \ | |
| 587 ${INSTALL_DATA} $${icon} $${iicon} ; \ | |
| 588 fi ; \ | |
| 589 done | |
| 590 | |
| 574 ### Install LEIM files. Although they are machine-independent, we | 591 ### Install LEIM files. Although they are machine-independent, we |
| 575 ### have separate target here instead of including it in | 592 ### have separate target here instead of including it in |
| 576 ### `install-arch-indep'. People who extracted LEIM files after they | 593 ### `install-arch-indep'. People who extracted LEIM files after they |
| 577 ### insalled Emacs itself can install only LEIM files by this target. | 594 ### insalled Emacs itself can install only LEIM files by this target. |
| 578 install-leim: leim/Makefile mkdir | 595 install-leim: leim/Makefile mkdir |
| 589 mkdir: FRC | 606 mkdir: FRC |
| 590 if [ -d $(DESTDIR)${datadir} ]; then true; else \ | 607 if [ -d $(DESTDIR)${datadir} ]; then true; else \ |
| 591 $(srcdir)/mkinstalldirs $(DESTDIR)${datadir}; \ | 608 $(srcdir)/mkinstalldirs $(DESTDIR)${datadir}; \ |
| 592 chmod a+r $(DESTDIR)${datadir};\ | 609 chmod a+r $(DESTDIR)${datadir};\ |
| 593 fi | 610 fi |
| 611 icondirs= ; \ | |
| 612 for dir in $(srcdir)/etc/images/icons/*/*x*/apps; do \ | |
| 613 if [ -d $${dir} ]; then \ | |
| 614 icondirs="$${icondirs} $${dir}" ; \ | |
| 615 fi ; \ | |
| 616 done ; \ | |
| 617 icondirs=`echo "$${icondirs}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},g'` ; \ | |
| 594 $(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \ | 618 $(srcdir)/mkinstalldirs ${COPYDESTS} $(DESTDIR)${infodir} $(DESTDIR)${man1dir} \ |
| 595 $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \ | 619 $(DESTDIR)${bindir} $(DESTDIR)${docdir} $(DESTDIR)${libexecdir} \ |
| 596 $(DESTDIR)${datadir}/emacs/site-lisp \ | 620 $(DESTDIR)${datadir}/emacs/site-lisp \ |
| 597 $(DESTDIR)${datadir}/emacs/${version}/site-lisp \ | 621 $(DESTDIR)${datadir}/emacs/${version}/site-lisp \ |
| 598 $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` | 622 $(DESTDIR)`echo ${locallisppath} | sed 's,:, $(DESTDIR),g'` \ |
| 623 $(DESTDIR)${desktopdir} $${icondirs} | |
| 599 | 624 |
| 600 ### Delete all the installed files that the `install' target would | 625 ### Delete all the installed files that the `install' target would |
| 601 ### create (but not the noninstalled files such as `make all' would | 626 ### create (but not the noninstalled files such as `make all' would |
| 602 ### create). | 627 ### create). |
| 603 ### | 628 ### |