comparison Makefile.in @ 112123:5e63c33ad48c

Don't use $MAKEINFO for both a flag and a program. * configure.in (HAVE_MAKEINFO): New output variable. (MAKEINFO): Reset to "makeinfo" if not found. * Makefile.in (install-arch-indep, info): Replace MAKEINFO = off with HAVE_MAKEINFO = no.
author Glenn Morris <rgm@gnu.org>
date Tue, 04 Jan 2011 23:10:47 -0800
parents ca22802893d9
children c5917804ecad c428fb33aede
comparison
equal deleted inserted replaced
112122:a28fc1581b94 112123:5e63c33ad48c
1 # DIST: This is the distribution Makefile for Emacs. configure can 1 # DIST: This is the distribution Makefile for Emacs. configure can
2 # DIST: make most of the changes to this file you might want, so try 2 # DIST: make most of the changes to this file you might want, so try
3 # DIST: that first. 3 # DIST: that first.
4 4
5 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 5 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
6 # 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 6 # 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
7 # Free Software Foundation, Inc. 7 # Free Software Foundation, Inc.
8 8
9 # This file is part of GNU Emacs. 9 # This file is part of GNU Emacs.
10 10
11 # GNU Emacs is free software: you can redistribute it and/or modify 11 # GNU Emacs is free software: you can redistribute it and/or modify
71 CC=@CC@ 71 CC=@CC@
72 CFLAGS=@CFLAGS@ 72 CFLAGS=@CFLAGS@
73 LDFLAGS=@LDFLAGS@ 73 LDFLAGS=@LDFLAGS@
74 CPPFLAGS=@CPPFLAGS@ 74 CPPFLAGS=@CPPFLAGS@
75 EXEEXT=@EXEEXT@ 75 EXEEXT=@EXEEXT@
76 MAKEINFO=@MAKEINFO@
77 76
78 ### These help us choose version- and architecture-specific directories 77 ### These help us choose version- and architecture-specific directories
79 ### to install files in. 78 ### to install files in.
80 79
81 ### This should be the number of the Emacs version we're building, 80 ### This should be the number of the Emacs version we're building,
137 ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \ 136 ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \
138 eshell eudc flymake forms gnus idlwave info mairix-el \ 137 eshell eudc flymake forms gnus idlwave info mairix-el \
139 message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ 138 message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \
140 reftex remember sasl sc semantic ses sieve smtpmail speedbar \ 139 reftex remember sasl sc semantic ses sieve smtpmail speedbar \
141 tramp url vip viper widget woman 140 tramp url vip viper widget woman
141
142 # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes".
143 HAVE_MAKEINFO=@HAVE_MAKEINFO@
142 144
143 # Directory for local state files for all programs. 145 # Directory for local state files for all programs.
144 localstatedir=@localstatedir@ 146 localstatedir=@localstatedir@
145 147
146 # Where to look for bitmap files. 148 # Where to look for bitmap files.
570 ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \ 572 ${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir; \
571 chmod a+r $(DESTDIR)${infodir}/dir); \ 573 chmod a+r $(DESTDIR)${infodir}/dir); \
572 fi; \ 574 fi; \
573 cd ${srcdir}/info ; \ 575 cd ${srcdir}/info ; \
574 for elt in $(INFO_FILES); do \ 576 for elt in $(INFO_FILES); do \
575 test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ 577 test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \
576 for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ 578 for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
577 ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \ 579 ${INSTALL_DATA} $$f $(DESTDIR)${infodir}/$$f; \
578 chmod a+r $(DESTDIR)${infodir}/$$f; \ 580 chmod a+r $(DESTDIR)${infodir}/$$f; \
579 if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ 581 if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \
580 rm -f $(DESTDIR)${infodir}/$$f.gz; \ 582 rm -f $(DESTDIR)${infodir}/$$f.gz; \
586 -unset CDPATH; \ 588 -unset CDPATH; \
587 thisdir=`/bin/pwd`; \ 589 thisdir=`/bin/pwd`; \
588 if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \ 590 if [ `(cd ${srcdir}/info && /bin/pwd)` != `(cd $(DESTDIR)${infodir} && /bin/pwd)` ]; \
589 then \ 591 then \
590 for elt in $(INFO_FILES); do \ 592 for elt in $(INFO_FILES); do \
591 test "$(MAKEINFO)" = "off" && ! test -e $$elt && continue; \ 593 test "$(HAVE_MAKEINFO)" = "no" && ! test -e $$elt && continue; \
592 (cd $${thisdir}; \ 594 (cd $${thisdir}; \
593 ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \ 595 ${INSTALL_INFO} --info-dir=$(DESTDIR)${infodir} $(DESTDIR)${infodir}/$$elt); \
594 done; \ 596 done; \
595 else true; fi 597 else true; fi
596 -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} 598 -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS}
832 # While it would be nice to give a more detailed error message, that 834 # While it would be nice to give a more detailed error message, that
833 # would require changing every rule in doc/ that builds an info file, 835 # would require changing every rule in doc/ that builds an info file,
834 # and it's not worth it. This case is only relevant if you download a 836 # and it's not worth it. This case is only relevant if you download a
835 # release, then change the .texi files. 837 # release, then change the .texi files.
836 info: force-info 838 info: force-info
837 @if test "$(MAKEINFO)" = "off"; then \ 839 @if test "$(HAVE_MAKEINFO)" = "no"; then \
838 echo "Configured --without-makeinfo, not building manuals" ; \ 840 echo "Configured --without-makeinfo, not building manuals" ; \
839 else \ 841 else \
840 $(MAKE) $(MFLAGS) info-real ; \ 842 $(MAKE) $(MFLAGS) info-real ; \
841 fi 843 fi
842 844