HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove the vc-dir-insert-directories global.
[bpt/emacs.git]
/
Makefile.in
diff --git
a/Makefile.in
b/Makefile.in
index
e50e869
..
1637f48
100644
(file)
--- a/
Makefile.in
+++ b/
Makefile.in
@@
-8,10
+8,10
@@
# This file is part of GNU Emacs.
# This file is part of GNU Emacs.
-# GNU Emacs is free software
;
you can redistribute it and/or modify
+# 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
# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation
; either version 3, or (at your option)
-# any later version.
+# the Free Software Foundation
, either version 3 of the License, or
+#
(at your option)
any later version.
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,9
+19,9
@@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# GNU General Public License for more details.
# 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., 51 Franklin Street, Fifth Floor,
-#
Boston, MA 02110-1301, USA.
+# along with GNU Emacs
. If not, see <http://www.gnu.org/licenses/>.
+
+#
## Commentary:
# make all to compile and build Emacs.
# make install to install it.
# make all to compile and build Emacs.
# make install to install it.
@@
-84,6
+84,7
@@
CPPFLAGS=@CPPFLAGS@
C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
EXEEXT=@EXEEXT@
C_SWITCH_X_SITE=@C_SWITCH_X_SITE@
LD_SWITCH_X_SITE=@LD_SWITCH_X_SITE@
EXEEXT=@EXEEXT@
+MAKEINFO=@MAKEINFO@
### These help us choose version- and architecture-specific directories
### to install files in.
### These help us choose version- and architecture-specific directories
### to install files in.
@@
-262,8
+263,8
@@
EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'`
# leim is not included because it needs special handling.
SUBDIR = lib-src src
# leim is not included because it needs special handling.
SUBDIR = lib-src src
-# The
makefiles of the directories in $SUBDIR
.
-SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
+# The
subdir makefiles created by config.status
.
+SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile
lisp/Makefile
# Subdirectories to install, and where they'll go.
# lib-src's makefile knows how to install it, so we don't do that here.
# Subdirectories to install, and where they'll go.
# lib-src's makefile knows how to install it, so we don't do that here.
@@
-370,6
+371,9
@@
lwlib/Makefile: $(srcdir)/lwlib/Makefile.in config.status
leim/Makefile: $(srcdir)/leim/Makefile.in config.status
./config.status
leim/Makefile: $(srcdir)/leim/Makefile.in config.status
./config.status
+lisp/Makefile: $(srcdir)/lisp/Makefile.in config.status
+ ./config.status
+
# ==================== Installation ====================
## If we let lib-src do its own installation, that means we
# ==================== Installation ====================
## If we let lib-src do its own installation, that means we
@@
-550,6
+554,7
@@
install-arch-indep: mkdir info install-etc
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
+ test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
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; \
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; \
@@
-561,6
+566,7
@@
install-arch-indep: mkdir info install-etc
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
then \
for elt in $(INFO_FILES); do \
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
then \
for elt in $(INFO_FILES); do \
+ test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done; \
@@
-578,8
+584,8
@@
install-arch-indep: mkdir info install-etc
install-etc: mkdir
${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
$(DESTDIR)${desktopdir}/emacs.desktop
install-etc: mkdir
${INSTALL_DATA} ${srcdir}/etc/emacs.desktop \
$(DESTDIR)${desktopdir}/emacs.desktop
- for icon in $(iconsrcdir)/*/*
x*
/apps/*.* \
- $(iconsrcdir)/*/
scalable/app
s/*.*; do \
+ for icon in $(iconsrcdir)/*/*/apps/*.* \
+ $(iconsrcdir)/*/
*/mimetype
s/*.*; do \
if [ -r $${icon} ]; then \
iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \
${INSTALL_DATA} $${icon} $${iicon} ; \
if [ -r $${icon} ]; then \
iicon=`echo "$${icon}" | sed 's,$(srcdir)/etc/images/icons,$(DESTDIR)${icondir},'` ; \
${INSTALL_DATA} $${icon} $${iicon} ; \
@@
-607,7
+613,7
@@
mkdir: FRC
chmod a+r $(DESTDIR)${datadir};\
fi
icondirs= ; \
chmod a+r $(DESTDIR)${datadir};\
fi
icondirs= ; \
- for dir in $(iconsrcdir)/*/*
x*/apps $(iconsrcdir)/*/scalable/app
s; do \
+ for dir in $(iconsrcdir)/*/*
/apps $(iconsrcdir)/*/*/mimetype
s; do \
if [ -d $${dir} ]; then \
icondirs="$${icondirs} $${dir}" ; \
fi ; \
if [ -d $${dir} ]; then \
icondirs="$${icondirs} $${dir}" ; \
fi ; \
@@
-767,15
+773,26
@@
dist:
cd ${srcdir}; ./make-dist
.PHONY: info dvi dist check html
cd ${srcdir}; ./make-dist
.PHONY: info dvi dist check html
+
+info-real:
+ -(cd doc/emacs; $(MAKE) $(MFLAGS) info)
+ -(cd doc/misc; $(MAKE) $(MFLAGS) info)
+ -(cd doc/lispref; $(MAKE) $(MFLAGS) info)
+ -(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+
force-info:
# Note that man/Makefile knows how to
# put the info files in $(srcdir),
# so we can do ok running make in the build dir.
info: force-info
force-info:
# Note that man/Makefile knows how to
# put the info files in $(srcdir),
# so we can do ok running make in the build dir.
info: force-info
- -(cd doc/emacs; $(MAKE) $(MFLAGS) info)
- -(cd doc/misc; $(MAKE) $(MFLAGS) info)
- -(cd doc/lispref; $(MAKE) $(MFLAGS) info)
- -(cd doc/lispintro; $(MAKE) $(MFLAGS) info)
+ @if test "$(MAKEINFO)" = "off"; then \
+ echo "Configured --without-makeinfo, not building manuals" ; \
+ elif test "$(MAKEINFO)" = "no"; then \
+ echo "makeinfo is missing - cannot build manuals" ; \
+ exit 1 ; \
+ else \
+ $(MAKE) $(MFLAGS) info-real ; \
+ fi
# The info/dir file must be updated by hand when new manuals are added.
check-info-dir: info
# The info/dir file must be updated by hand when new manuals are added.
check-info-dir: info