HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix face attributes recognition
[bpt/emacs.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
12ef4be
..
92070a4
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-2,14
+2,15
@@
# 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,04,2005,2006
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+# 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# GNU Emacs is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# Free Software Foundation, Inc.
# This file is part of GNU Emacs.
# GNU Emacs is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version
2
, or (at your option)
+# the Free Software Foundation; either version
3
, or (at your option)
# any later version.
# GNU Emacs is distributed in the hope that it will be useful,
# any later version.
# GNU Emacs is distributed in the hope that it will be useful,
@@
-110,6
+111,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@
@@
-135,7
+140,7
@@
man1dir=$(mandir)/man1
# 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 \
# 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 e
macs-xtra e
shell eudc flymake \
+ 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
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
@@
-280,7
+285,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.
@@
-400,11
+405,16
@@
install-arch-dep: mkdir
### Install the files that are machine-independent.
### Most of them come straight from the distribution;
### the exception is the DOC-* files, which are copied
### 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
@@
-469,7
+479,7
@@
install-arch-indep: mkdir info
(cd ./etc; tar -chf - DOC*) \
|(cd $(DESTDIR)${docdir}; umask 022; tar -xvf - && cat > /dev/null) || exit 1; \
(cd $(DESTDIR)$(docdir); chown $${LOGNAME:-$$USERNAME} DOC*; chmod a+r DOC*; \
(cd ./etc; tar -chf - 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); \
+ if test "`echo DOC-*`" != "DOC-*"; then rm
-f
DOC; fi); \
else true; fi
-unset CDPATH; \
if [ -r ./lisp ] \
else true; fi
-unset CDPATH; \
if [ -r ./lisp ] \
@@
-518,7
+528,7
@@
install-arch-indep: mkdir info
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done; \
else true; fi
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done; \
else true; fi
- -chmod -R a+r $(DESTDIR)${datadir}/emacs ${COPYDESTS} $(DESTDIR)${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 \
thisdir=`/bin/pwd`; \
cd ${srcdir}/etc; \
for page in emacs emacsclient etags ctags ; do \
@@
-790,6
+800,7
@@
bootstrap-build: FRC
### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
bootstrap-clean-before: bootstrap-clean-before-fast FRC
(cd lisp; $(MAKE) $(MFLAGS) bootstrap-clean)
### Used for `bootstrap' to avoid deleting existing dumped Emacs executables.
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.
### Used for `bootfast' to avoid deleting existing dumped Emacs executables
### and compiled .elc files.