X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/316f8af0092ff66f564fd3052d2e35baa9a5817f..2311d8e5a62b8b6dd7dde45b4b8059d443e2abac:/Makefile.in diff --git a/Makefile.in b/Makefile.in index f5bc0ce701..8851384162 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,7 +2,7 @@ # DIST: make most of the changes to this file you might want, so try # DIST: that first. -# Copyright (C) 1992-2011 Free Software Foundation, Inc. +# Copyright (C) 1992-2012 Free Software Foundation, Inc. # This file is part of GNU Emacs. @@ -66,6 +66,11 @@ CDPATH= # ==================== Things `configure' Might Edit ==================== +MAINTAINER_MODE_FLAG = --disable-maintainer-mode +@MAINT@MAINTAINER_MODE_FLAG = --enable-maintainer-mode +cache_file = @cache_file@ +CONFIGURE_FLAGS = --cache-file=$(cache_file) $(MAINTAINER_MODE_FLAG) + CC=@CC@ CFLAGS=@CFLAGS@ LDFLAGS=@LDFLAGS@ @@ -131,11 +136,11 @@ MAN_PAGES=ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ # system, it is inappropriate to imply that it is part of Emacs. infodir=@infodir@ INFO_FILES=ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse \ - ede ediff edt eieio efaq eintr elisp emacs emacs-mime epa erc \ - ert eshell eudc flymake forms gnus idlwave info mairix-el \ - message mh-e newsticker nxml-mode org pcl-cvs pgg rcirc \ - reftex remember sasl sc semantic ses sieve smtpmail speedbar \ - tramp url vip viper widget woman + ede ediff edt eieio efaq eintr elisp emacs emacs-gnutls \ + emacs-mime epa erc ert eshell eudc flymake forms gnus \ + idlwave info mairix-el message mh-e newsticker nxml-mode \ + org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses \ + sieve smtpmail speedbar tramp url vip viper widget woman # If no makeinfo was found and configured --without-makeinfo, "no"; else "yes". HAVE_MAKEINFO=@HAVE_MAKEINFO@ @@ -203,11 +208,8 @@ lisppath=@lisppath@ # building. This is only used during the process of # compiling Emacs, to help Emacs find its lisp files # before they've been installed in their final location. -# It's usually identical to lisppath, except that -# it does not include locallisppath, and the -# entry for the directory containing the installed lisp -# files has been replaced with ../lisp. This should be a -# colon-separated list of directories. +# This should be a colon-separated list of directories. +# Normally it points to the lisp/ directory in the sources. buildlisppath=${srcdir}/lisp # Where to install the other architecture-independent @@ -307,9 +309,7 @@ epaths-force: FRC # running more than 1 process in the leim directory, especially for # the $TIT files there. leim: src Makefile FRC - (export PARALLEL; PARALLEL=0; cd $@; $(MAKE) all $(MFLAGS) \ - CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \ - LDFLAGS='${LDFLAGS}' MAKE='${MAKE}') + cd leim && PARALLEL=0 $(MAKE) all $(MFLAGS) lib-src src: lib @@ -339,7 +339,7 @@ GNULIB_MODULES = \ mktime pthread_sigmask readlink \ socklen stdarg stdio strftime strtoimax strtoumax symlink sys_stat GNULIB_TOOL_FLAGS = \ - --avoid=msvc-inval --avoid=msvc-nothrow --avoid=pathmax \ + --avoid=msvc-inval --avoid=msvc-nothrow \ --avoid=raise --avoid=threadlib \ --conditional-dependencies --import --no-changelog --no-vc-files \ --makefile-name=gnulib.mk @@ -404,7 +404,7 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el if [ -x ./config.status ]; then \ ./config.status --recheck; \ else \ - ./configure; \ + ./configure $(CONFIGURE_FLAGS); \ fi AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4 @@ -474,10 +474,10 @@ install-arch-dep: mkdir if test -d share/emacs ; then dir=share/emacs/*/*; $(MV_DIRS); fi;\ if test -d share/info ; then dir=share/info; $(MV_DIRS) ; fi ; \ rm -fr share ) ; \ - ( cd ${ns_appbindir}libexec ; dir=emacs/*/*/* ; $(MV_DIRS); \ - rm -fr emacs ) ; \ - ( cd ${ns_appbindir}bin ; rm -f emacs emacs-24* ; \ - ln -sf ../libexec/* .) ; \ + ( cd ${ns_appbindir} ; \ + if cd libexec ; then dir=emacs/*/*/* ; $(MV_DIRS); \ + rm -fr emacs; if cd ../bin; then rm -f emacs emacs-24*; \ + ln -sf ../libexec/* . ; fi ; fi ) ; \ else true ; fi ## FIXME is the emacs-24* bit above really necessary and correct? @@ -666,13 +666,13 @@ install-etc: mkdir ### Install LEIM files. Although they are machine-independent, we ### have separate target here instead of including it in ### `install-arch-indep'. People who extracted LEIM files after they -### insalled Emacs itself can install only LEIM files by this target. +### installed Emacs itself can install only LEIM files by this target. install-leim: leim/Makefile mkdir - cd leim; $(MAKE) install + cd leim && $(MAKE) $(MFLAGS) install ### Build Emacs and install it, stripping binaries while installing them. install-strip: - $(MAKE) INSTALL_STRIP=-s install + $(MAKE) $(MFLAGS) INSTALL_STRIP=-s install ### Build all the directories we're going to install Emacs in. Since ### we may be creating several layers of directories (for example, @@ -725,11 +725,16 @@ uninstall: (cd $(DESTDIR)${infodir} && \ for elt in $(INFO_FILES); do \ $(INSTALL_INFO) --remove --info-dir=. $$elt; \ - for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \ + if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ + ext=.gz; else ext=; fi; \ + for f in `ls $$elt$$ext $$elt-[1-9]$$ext $$elt-[1-9][0-9]$$ext 2>/dev/null`; do \ rm -f $$f; \ done; \ done;) - (cd $(DESTDIR)${man1dir} && rm -f $(MAN_PAGES)) + (if [ -n "${GZIP_INFO}" ] && [ -n "${GZIP_PROG}" ]; then \ + ext=.gz; else ext=; fi; \ + cd $(DESTDIR)${man1dir} && for page in ${MAN_PAGES}; do \ + rm -f $$page$$ext; done ) (cd $(DESTDIR)${bindir} && rm -f $(EMACSFULL) $(EMACS)) (cd $(DESTDIR)${icondir} && rm -f hicolor/*x*/apps/emacs.png hicolor/*x*/apps/emacs22.png hicolor/scalable/apps/emacs.svg hicolor/scalable/mimetypes/emacs-document.svg ) -rm -f $(DESTDIR)${desktopdir}/emacs.desktop @@ -936,7 +941,7 @@ bootstrap: bootstrap-clean FRC if [ -x ./config.status ]; then \ ./config.status; \ else \ - ./configure --enable-maintainer-mode; \ + ./configure $(CONFIGURE_FLAGS); \ fi $(MAKE) $(MFLAGS) info all