mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-26 07:33:47 +00:00
Code Issues Releases Activity

(install-arch-indep, info): Handle MAKEINFO == off.

Browse Source
This commit is contained in:
Glenn Morris 2008-05-09 04:28:28 +00:00
parent 09817afc31
commit 1c73f19533
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-05-09 Glenn Morris <rgm@gnu.org>
* configure.in: Make absence of makeinfo a fatal error only if the info
files don't exist.
* Makefile.in (install-arch-indep, info): Handle MAKEINFO == off.
2008-05-07 Eli Zaretskii <eliz@gnu.org>
* config.bat: Fix last change: don't use < and > in "rem" lines,

11
Makefile.in
View File

@ -554,7 +554,7 @@ install-arch-indep: mkdir info install-etc
fi; \
cd ${srcdir}/info ; \
for elt in $(INFO_FILES); do \
test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \
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; \
@ -566,7 +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 \
test "$(MAKEINFO)" = "no" && ! test -e $$elt && continue; \
test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \
(cd $${thisdir}; \
${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
done; \
@ -785,8 +785,11 @@ force-info:
# put the info files in $(srcdir),
# so we can do ok running make in the build dir.
info: force-info
@if test "$(MAKEINFO)" = "no"; then \
echo "Configured without makeinfo, not building manuals" ; \
@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