[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, 03 May 2008 20:16:34 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 08/05/03 20:16:33
Index: Makefile.in
===================================================================
RCS file: /sources/emacs/emacs/Makefile.in,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -b -r1.344 -r1.345
--- Makefile.in 28 Mar 2008 09:58:35 -0000 1.344
+++ Makefile.in 3 May 2008 20:16:32 -0000 1.345
@@ -84,6 +84,7 @@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
### These help us choose version- and architecture-specific directories
### to install files in.
@@ -553,6 +554,7 @@
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
+ test "$(MAKEINFO)" = "no" && ! 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; \
@@ -564,6 +566,7 @@
if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} &&
/bin/pwd)` ]; \
then \
for elt in $(INFO_FILES); do \
+ test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir}
$(DESTDIR)${infodir}/$$elt); \
done; \
@@ -770,15 +773,23 @@
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
- -(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)" = "no"; then \
+ echo "Configured without makeinfo, not building manuals" ; \
+ else \
+ $(MAKE) $(MFLAGS) info-real ; \
+ fi
# The info/dir file must be updated by hand when new manuals are added.
check-info-dir: info
- [Emacs-diffs] Changes to emacs/Makefile.in,v,
Glenn Morris <=