HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix URL of EmacsW32 site where building with image support is described.
[bpt/emacs.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
28c3ff8
..
10fedcc
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-2,8
+2,8
@@
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
# DIST: make most of the changes to this file you might want, so try
# DIST: that first.
-# Copyright (C) 1992,
93,94,95,96,97,98,1999,2000,01,02,03,2004
-# Free Software Foundation, Inc.
+# Copyright (C) 1992,
1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+#
2001, 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# This file is part of GNU Emacs.
@@
-19,8
+19,8
@@
# You should have received a copy of the GNU General Public License
# along with GNU Emacs; see the file COPYING. If not, write to
# You should have received a copy of the GNU General Public License
# along with GNU Emacs; see the file COPYING. If not, write to
-# the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-# Boston, MA 0211
1-1307
, USA.
+# the Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+# Boston, MA 0211
0-1301
, USA.
# make all to compile and build Emacs.
# make install to install it.
# make all to compile and build Emacs.
# make install to install it.
@@
-51,6
+51,15
@@
#
# make extraclean
# Still more severe - delete backup and autosave files, too.
#
# make extraclean
# Still more severe - delete backup and autosave files, too.
+#
+# make bootstrap
+# Recompiles all the Emacs Lisp files using the latest source,
+# then rebuilds Emacs.
+#
+# make bootfast
+# Recompiles changed Emacs Lisp files using the latest C source,
+# then rebuilds Emacs. This is faster than `make bootstrap'
+# but once in a while an old .elc file can cause trouble.
SHELL = /bin/sh
SHELL = /bin/sh
@@
-101,6
+110,10
@@
exec_prefix=@exec_prefix@
# run directly (like etags).
bindir=@bindir@
# run directly (like etags).
bindir=@bindir@
+# The root of the directory tree for read-only architecture-independent
+# data files. ${datadir}, ${infodir} and ${mandir} are based on this.
+datarootdir=@datarootdir@
+
# Where to install architecture-independent data files. ${lispdir}
# and ${etcdir} are subdirectories of this.
datadir=@datadir@
# Where to install architecture-independent data files. ${lispdir}
# and ${etcdir} are subdirectories of this.
datadir=@datadir@
@@
-125,6
+138,11
@@
man1dir=$(mandir)/man1
# since there are now many packages documented with the texinfo
# system, it is inappropriate to imply that it is part of Emacs.
infodir=@infodir@
# since there are now many packages documented with the texinfo
# system, it is inappropriate to imply that it is part of Emacs.
infodir=@infodir@
+INFO_FILES=ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq \
+ elisp eintr emacs emacs-mime eshell eudc flymake \
+ forms gnus idlwave info message mh-e newsticker org pcl-cvs \
+ pgg reftex sc ses sieve speedbar tramp vip viper widget \
+ woman smtpmail url rcirc erc
# Directory for local state files for all programs.
localstatedir=@localstatedir@
# Directory for local state files for all programs.
localstatedir=@localstatedir@
@@
-214,6
+232,9
@@
INSTALL_INFO = @INSTALL_INFO@
# By default, we uphold the dignity of our programs.
INSTALL_STRIP =
# By default, we uphold the dignity of our programs.
INSTALL_STRIP =
+# We use gzip to compress installed .el files.
+GZIP_PROG = @GZIP_PROG@
+
# ============================= Targets ==============================
# Program name transformation.
# ============================= Targets ==============================
# Program name transformation.
@@
-238,7
+259,7
@@
SUBDIR_MAKEFILES = lib-src/Makefile man/Makefile lispref/Makefile lispintro/Make
# avoid nuking an existing dir file, so we don't do that here;
# instead, we have written out explicit code in the `install' targets.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
# avoid nuking an existing dir file, so we don't do that here;
# instead, we have written out explicit code in the `install' targets.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
-COPYDESTS = $
{etcdir}
${lispdir}
+COPYDESTS = $
(DESTDIR)${etcdir} $(DESTDIR)
${lispdir}
all: ${SUBDIR} leim
all: ${SUBDIR} leim
@@
-251,8
+272,8
@@
epaths-force: FRC
x_default_search_path=`echo ${x_default_search_path}`; \
gamedir=`echo ${gamedir}`; \
sed < ${srcdir}/src/epaths.in > epaths.h.$$$$ \
x_default_search_path=`echo ${x_default_search_path}`; \
gamedir=`echo ${gamedir}`; \
sed < ${srcdir}/src/epaths.in > epaths.h.$$$$ \
- -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'
$${lisppath}'";'
\
- -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'
$${buildlisppath}
'";' \
+ -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'
"$${lisppath}"'";'
\
+ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'
"$${buildlisppath}"
'";' \
-e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \
-e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \
-e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \
-e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \
-e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \
-e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \
@@
-263,7
+284,7
@@
epaths-force: FRC
-e 's;/[*] *arch-tag:.*;/*;') && \
${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
-e 's;/[*] *arch-tag:.*;/*;') && \
${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
-# For parallel make, src should be buil
d
before leim.
+# For parallel make, src should be buil
t
before leim.
# "export PARALLEL=0" is for SGI's Make, to prevent it from
# running more than 1 process in the leim directory, especially for
# the $TIT files there.
# "export PARALLEL=0" is for SGI's Make, to prevent it from
# running more than 1 process in the leim directory, especially for
# the $TIT files there.
@@
-290,15
+311,17
@@
blessmail: ${SUBDIR_MAKEFILES} src FRC
Makefile: $(srcdir)/Makefile.in config.status
./config.status
Makefile: $(srcdir)/Makefile.in config.status
./config.status
-config.status: ${srcdir}/configure
+config.status: ${srcdir}/configure
${srcdir}/lisp/version.el
./config.status --recheck
./config.status --recheck
-${srcdir}/configure: @MAINT@ ${srcdir}/configure.in
+AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4
+
+$(srcdir)/configure: $(AUTOCONF_INPUTS)
cd ${srcdir} && autoconf
$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@true
cd ${srcdir} && autoconf
$(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in
@true
-$(srcdir)/src/stamp-h.in:
@MAINT@ ${srcdir}/configure.in
+$(srcdir)/src/stamp-h.in:
$(AUTOCONF_INPUTS)
cd ${srcdir} && autoheader
rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in
cd ${srcdir} && autoheader
rm -f $(srcdir)/src/stamp-h.in
echo timestamp > $(srcdir)/src/stamp-h.in
@@
-361,31
+384,36
@@
install-arch-dep: mkdir
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP})
- ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} ${bindir}/$(EMACSFULL)
- -chmod 1755
${bindir}/$(EMACSFULL)
- rm -f ${bindir}/$(EMACS)
- -ln $
{bindir}/$(EMACSFULL)
${bindir}/$(EMACS)
+ ${INSTALL_PROGRAM} $(INSTALL_STRIP) src/emacs${EXEEXT} $
(DESTDIR)$
{bindir}/$(EMACSFULL)
+ -chmod 1755
$(DESTDIR)
${bindir}/$(EMACSFULL)
+ rm -f $
(DESTDIR)$
{bindir}/$(EMACS)
+ -ln $
(DESTDIR)${bindir}/$(EMACSFULL) $(DESTDIR)
${bindir}/$(EMACS)
-unset CDPATH; \
for f in `cd lib-src && echo fns-*.el`; do \
if test -r lib-src/$$f ; then \
-unset CDPATH; \
for f in `cd lib-src && echo fns-*.el`; do \
if test -r lib-src/$$f ; then \
- ${INSTALL_DATA} lib-src/$$f ${archlibdir}/$$f; \
+ ${INSTALL_DATA} lib-src/$$f $
(DESTDIR)$
{archlibdir}/$$f; \
else true; fi ; \
done
if test "${carbon_appdir}" != ""; then \
else true; fi ; \
done
if test "${carbon_appdir}" != ""; then \
- umask 022; mkdir -p ${carbon_appdir}/Emacs.app; \
+ umask 022; mkdir -p $
(DESTDIR)$
{carbon_appdir}/Emacs.app; \
(cd mac/Emacs.app; (tar -chf - . | \
(cd mac/Emacs.app; (tar -chf - . | \
- (cd ${carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
+ (cd $
(DESTDIR)$
{carbon_appdir}/Emacs.app; umask 022; tar -xvf - \
&& cat > /dev/null))) || exit 1; \
fi
### Install the files that are machine-independent.
### Most of them come straight from the distribution;
### the exception is the DOC-* files, which are copied
&& cat > /dev/null))) || exit 1; \
fi
### Install the files that are machine-independent.
### Most of them come straight from the distribution;
### the exception is the DOC-* files, which are copied
-## from the build directory.
+##
#
from the build directory.
## Note that we copy DOC* and then delete DOC
## as a workaround for a bug in tar on Ultrix 4.2.
## Note that we copy DOC* and then delete DOC
## as a workaround for a bug in tar on Ultrix 4.2.
+## FIXME
+## Should only install the DOC- file appropriate to this build, not DOC-*.
+## http://lists.gnu.org/archive/html/emacs-pretest-bug/2007-01/msg00417.html
+## (fix available for consideration post-release).
+
## If people complain about the h flag in tar command, take that out.
## That flag is also used in leim/Makefile.in
install-arch-indep: mkdir info
## If people complain about the h flag in tar command, take that out.
## That flag is also used in leim/Makefile.in
install-arch-indep: mkdir info
@@
-415,6
+443,7
@@
install-arch-indep: mkdir info
rm -rf $${subdir}/RCS ; \
rm -rf $${subdir}/CVS ; \
rm -f $${subdir}/.cvsignore ; \
rm -rf $${subdir}/RCS ; \
rm -rf $${subdir}/CVS ; \
rm -f $${subdir}/.cvsignore ; \
+ rm -f $${subdir}/.arch-inventory ; \
rm -f $${subdir}/\#* ; \
rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*~ ; \
rm -f $${subdir}/\#* ; \
rm -f $${subdir}/.\#* ; \
rm -f $${subdir}/*~ ; \
@@
-424,78
+453,87
@@
install-arch-indep: mkdir info
rm -f $${subdir}/dired.todo ; \
done) ; \
done
rm -f $${subdir}/dired.todo ; \
done) ; \
done
- -rm -f ${lispdir}/subdirs.el
- $(srcdir)/update-subdirs ${lispdir}
- if [ -f ${datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
+ -rm -f $
(DESTDIR)$
{lispdir}/subdirs.el
+ $(srcdir)/update-subdirs $
(DESTDIR)$
{lispdir}
+ if [ -f $
(DESTDIR)$
{datadir}/emacs/${version}/site-lisp/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
- > ${datadir}/emacs/${version}/site-lisp/subdirs.el; \
+ > $
(DESTDIR)$
{datadir}/emacs/${version}/site-lisp/subdirs.el; \
fi
fi
- chmod a+r ${datadir}/emacs/${version}/site-lisp/subdirs.el
- -if [ -f ${datadir}/emacs/site-lisp/subdirs.el ]; \
+ chmod a+r $
(DESTDIR)$
{datadir}/emacs/${version}/site-lisp/subdirs.el
+ -if [ -f $
(DESTDIR)$
{datadir}/emacs/site-lisp/subdirs.el ]; \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
then true; \
else \
(echo "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \
echo " (normal-top-level-add-subdirs-to-load-path))") \
- > ${datadir}/emacs/site-lisp/subdirs.el; \
+ > $
(DESTDIR)$
{datadir}/emacs/site-lisp/subdirs.el; \
fi
fi
- -chmod a+r ${datadir}/emacs/site-lisp/subdirs.el
+ -chmod a+r $
(DESTDIR)$
{datadir}/emacs/site-lisp/subdirs.el
-unset CDPATH; \
-unset CDPATH; \
- if [ `(cd ./etc; /bin/pwd)` != `(cd ${docdir}; /bin/pwd)` ]; \
+ if [ `(cd ./etc; /bin/pwd)` != `(cd $
(DESTDIR)$
{docdir}; /bin/pwd)` ]; \
then \
then \
- echo "Copying etc/DOC-* to ${docdir} ..." ; \
+ echo "Copying etc/DOC-* to $
(DESTDIR)$
{docdir} ..." ; \
(cd ./etc; tar -chf - DOC*) \
(cd ./etc; tar -chf - DOC*) \
- |(cd ${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
- (cd $(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
+ |(cd $
(DESTDIR)$
{docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
+ (cd $(
DESTDIR)$(
docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
else true; fi
-unset CDPATH; \
if [ -r ./lisp ] \
&& [ -r ./lisp/simple.el ] \
if test "`echo DOC-*`" != "DOC-*"; then rm DOC; fi); \
else true; fi
-unset CDPATH; \
if [ -r ./lisp ] \
&& [ -r ./lisp/simple.el ] \
- && [ x`(cd ./lisp; /bin/pwd)` != x`(cd ${lispdir}; /bin/pwd)` ] \
+ && [ x`(cd ./lisp; /bin/pwd)` != x`(cd $
(DESTDIR)$
{lispdir}; /bin/pwd)` ] \
&& [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
then \
&& [ x`(cd ${srcdir}/lisp; /bin/pwd)` != x`(cd ./lisp; /bin/pwd)` ]; \
then \
- echo "Copying lisp/*.el and lisp/*.elc to ${lispdir} ..." ; \
+ echo "Copying lisp/*.el and lisp/*.elc to $
(DESTDIR)$
{lispdir} ..." ; \
(cd lisp; tar -chf - *.el *.elc) \
(cd lisp; tar -chf - *.el *.elc) \
- |(cd ${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
- (cd ${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; \
+ |(cd $(DESTDIR)${lispdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
+ (cd $(DESTDIR)${lispdir}; find . -exec chown $${LOGNAME:-$$USERNAME} {} ';') ; \
+ else true; fi
+ -unset CDPATH; \
+ if [ -n "${GZIP_PROG}" ]; \
+ then \
+ echo "Compressing *.el ..." ; \
+ (cd $(DESTDIR)${lispdir}; for f in `find . -name "*.elc" -print`; do \
+ ${GZIP_PROG} -9n `echo $$f|sed 's/.elc$$/.el/'` ; \
+ done) \
else true; fi
-unset CDPATH; \
thisdir=`/bin/pwd`; \
else true; fi
-unset CDPATH; \
thisdir=`/bin/pwd`; \
- if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $
(DESTDIR)$
{infodir} && /bin/pwd)` ]; \
then \
then \
- (cd ${infodir}; \
+ (cd $
(DESTDIR)$
{infodir}; \
if [ -f dir ]; then true; \
else \
(cd $${thisdir}; \
if [ -f dir ]; then true; \
else \
(cd $${thisdir}; \
- ${INSTALL_DATA} ${srcdir}/info/dir ${infodir}/dir; \
- chmod a+r ${infodir}/dir); \
+ ${INSTALL_DATA} ${srcdir}/info/dir $
(DESTDIR)$
{infodir}/dir; \
+ chmod a+r $
(DESTDIR)$
{infodir}/dir); \
fi; \
cd ${srcdir}/info ; \
fi; \
cd ${srcdir}/info ; \
- for f in ada-mode* autotype* calc* ccmode* cl* dired-x* ebrowse* ediff* efaq* eintr* elisp* emacs* eshell* eudc* forms* gnus* idlwave* info* message* mh-e* pcl-cvs* reftex* sc* ses* speedbar* tramp* vip* widget* woman* smtpmail*; do \
- (cd $${thisdir}; \
- ${INSTALL_DATA} ${srcdir}/info/$$f ${infodir}/$$f; \
- chmod a+r ${infodir}/$$f); \
+ for elt in $(INFO_FILES); do \
+ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
+ ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
+ chmod a+r $(DESTDIR)${infodir}/$$f; \
+ done; \
done); \
else true; fi
-unset CDPATH; \
thisdir=`/bin/pwd`; \
done); \
else true; fi
-unset CDPATH; \
thisdir=`/bin/pwd`; \
- if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd ${infodir} && /bin/pwd)` ]; \
+ if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $
(DESTDIR)$
{infodir} && /bin/pwd)` ]; \
then \
then \
- for
f in ada-mode autotype calc ccmode cl dired-x ebrowse ediff efaq elisp eintr emacs emacs-mime eshell eudc forms gnus idlwave info message mh-e pcl-cvs reftex sc ses speedbar tramp vip viper widget woman smtpmail
; do \
+ for
elt in $(INFO_FILES)
; do \
(cd $${thisdir}; \
(cd $${thisdir}; \
- ${INSTALL_INFO} --info-dir=$
{infodir} ${infodir}/$$f
); \
+ ${INSTALL_INFO} --info-dir=$
(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt
); \
done; \
else true; fi
done; \
else true; fi
- -chmod -R a+r $
{datadir}/emacs ${COPYDESTS}
${infodir}
+ -chmod -R a+r $
(DESTDIR)${datadir}/emacs/${version} $(DESTDIR)${datadir}/emacs/site-lisp ${COPYDESTS} $(DESTDIR)
${infodir}
thisdir=`/bin/pwd`; \
cd ${srcdir}/etc; \
for page in emacs emacsclient etags ctags ; do \
(cd $${thisdir}; \
thisdir=`/bin/pwd`; \
cd ${srcdir}/etc; \
for page in emacs emacsclient etags ctags ; do \
(cd $${thisdir}; \
- ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 ${man1dir}/$${page}${manext}; \
- chmod a+r ${man1dir}/$${page}${manext}); \
+ ${INSTALL_DATA} ${srcdir}/etc/$${page}.1 $
(DESTDIR)$
{man1dir}/$${page}${manext}; \
+ chmod a+r $
(DESTDIR)$
{man1dir}/$${page}${manext}); \
done
### Install LEIM files. Although they are machine-independent, we
done
### Install LEIM files. Although they are machine-independent, we
@@
-514,15
+552,15
@@
install-strip:
### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
### instead of mkdir. Not all systems' mkdir programs have the `-p' flag.
mkdir: FRC
### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use mkinstalldirs
### instead of mkdir. Not all systems' mkdir programs have the `-p' flag.
mkdir: FRC
- if [ -d ${datadir} ]; then true; else \
- $(srcdir)/mkinstalldirs ${datadir}; \
- chmod a+r ${datadir};\
+ if [ -d $
(DESTDIR)$
{datadir} ]; then true; else \
+ $(srcdir)/mkinstalldirs $
(DESTDIR)$
{datadir}; \
+ chmod a+r $
(DESTDIR)$
{datadir};\
fi
fi
- $(srcdir)/mkinstalldirs ${COPYDESTS} $
{infodir}
${man1dir} \
- $
{bindir} ${docdir}
${libexecdir} \
- ${datadir}/emacs/site-lisp \
- ${datadir}/emacs/${version}/site-lisp \
-
`echo ${locallisppath} | sed 's/:/ /
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'`
### Delete all the installed files that the `install' target would
### create (but not the noninstalled files such as `make all' would
### Delete all the installed files that the `install' target would
### create (but not the noninstalled files such as `make all' would
@@
-535,24
+573,30
@@
uninstall:
prefix=${prefix} exec_prefix=${exec_prefix} \
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir})
-unset CDPATH; \
prefix=${prefix} exec_prefix=${exec_prefix} \
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir})
-unset CDPATH; \
- for dir in $
{lispdir} ${etcdir} ; do
\
+ for dir in $
(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do
\
if [ -d $${dir} ]; then \
case `(cd $${dir} ; /bin/pwd)` in \
`(cd ${srcdir} ; /bin/pwd)`* ) ;; \
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
if [ -d $${dir} ]; then \
case `(cd $${dir} ; /bin/pwd)` in \
`(cd ${srcdir} ; /bin/pwd)`* ) ;; \
* ) rm -rf $${dir} ;; \
esac ; \
case $${dir} in \
- $
{datadir}/emacs/${version}/* )
\
- rm -rf $
{datadir}/emacs/${version}
\
+ $
(DESTDIR)${datadir}/emacs/${version}/* )
\
+ rm -rf $
(DESTDIR)${datadir}/emacs/${version}
\
;; \
esac ; \
fi ; \
done
;; \
esac ; \
fi ; \
done
- (cd ${archlibdir} && rm -f fns-*)
- -rm -rf ${libexecdir}/emacs/${version}
- (cd ${infodir} && rm -f cl* ada-mode* autotype* calc* ccmode* ebrowse* efaq* eintr elisp* eshell* eudc* idlwave* message* pcl-cvs* reftex* speedbar* tramp* widget* woman* dired-x* ediff* emacs* forms* gnus* info* mh-e* sc* ses* vip* smtpmail*)
- (cd ${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
- (cd ${bindir} && rm -f $(EMACSFULL) $(EMACS))
+ (cd $(DESTDIR)${archlibdir} && rm -f fns-*)
+ -rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
+ (cd $(DESTDIR)${infodir} && \
+ for elt in $(INFO_FILES); do \
+ $(INSTALL_INFO) --remove --info-dir=. $$elt; \
+ for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
+ rm -f $$f; \
+ done; \
+ done;)
+ (cd $(DESTDIR)${man1dir} && rm -f emacs${manext} emacsclient${manext} etags${manext} ctags${manext})
+ (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS))
FRC:
FRC:
@@
-709,9
+753,9
@@
force-info:
# put the info files in $(srcdir),
# so we can do ok running make in the build dir.
info: force-info
# put the info files in $(srcdir),
# so we can do ok running make in the build dir.
info: force-info
- (cd man; $(MAKE) $(MFLAGS) info)
- (cd lispref; $(MAKE) $(MFLAGS) info)
- (cd lispintro; $(MAKE) $(MFLAGS) info)
+
-
(cd man; $(MAKE) $(MFLAGS) info)
+
-
(cd lispref; $(MAKE) $(MFLAGS) info)
+
-
(cd lispintro; $(MAKE) $(MFLAGS) info)
dvi:
(cd man; $(MAKE) $(MFLAGS) dvi)
(cd lispref; $(MAKE) $(MFLAGS) elisp.dvi)
dvi:
(cd man; $(MAKE) $(MFLAGS) dvi)
(cd lispref; $(MAKE) $(MFLAGS) elisp.dvi)
@@
-725,6
+769,8
@@
dvi:
### used to compile Lisp files. The last step is a "normal" make.
.PHONY: bootstrap
### used to compile Lisp files. The last step is a "normal" make.
.PHONY: bootstrap
+.PHONY: bootstrap-build
+.PHONY: bootfast
.PHONY: maybe_bootstrap
maybe_bootstrap:
.PHONY: maybe_bootstrap
maybe_bootstrap:
@@
-736,7
+782,13
@@
maybe_bootstrap:
exit 1;\
fi
exit 1;\
fi
-bootstrap: bootstrap-clean-before info FRC
+bootstrap: bootstrap-clean-before FRC
+ $(MAKE) $(MFLAGS) info bootstrap-build
+
+bootfast: bootstrap-clean-before-fast FRC
+ $(MAKE) $(MFLAGS) info bootstrap-build
+
+bootstrap-build: FRC
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare)
(cd src; $(MAKE) $(MFLAGS) bootstrap)
(cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs${EXEEXT})
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-prepare)
(cd src; $(MAKE) $(MFLAGS) bootstrap)
(cd lisp; $(MAKE) $(MFLAGS) bootstrap EMACS=../src/bootstrap-emacs${EXEEXT})
@@
-745,7
+797,13
@@
bootstrap: bootstrap-clean-before info FRC
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-after)
### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
-bootstrap-clean-before: FRC
+bootstrap-clean-before: bootstrap-clean-before-fast FRC
+ (cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
+ (cd leim; $(MAKE) $(MFLAGS) bootstrap-clean)
+
+### Used for `bootfast' to avoid deleting existing dumped Emacs executables
+### and compiled .elc files.
+bootstrap-clean-before-fast: FRC
(cd src; $(MAKE) $(MFLAGS) mostlyclean)
(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
(cd lwlib; $(MAKE) $(MFLAGS) clean)
(cd src; $(MAKE) $(MFLAGS) mostlyclean)
(cd oldXMenu; $(MAKE) $(MFLAGS) clean)
(cd lwlib; $(MAKE) $(MFLAGS) clean)