1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-17 00:30:37 -08:00
Commit graph

1769 commits

Author SHA1 Message Date
Glenn Morris
ed0ba302d3 Tweak dependencies in top-level install rules
* Makefile.in (install-arch-dep): Depend on install-arch-indep.
(install-arch-indep): Depend on install-leim.
(install): Remove explicit install-leim dependence.
2012-05-18 00:00:09 -07:00
Glenn Morris
62061397bf Remove the mkdir rule from the top-level Makefile
* Makefile.in (install-arch-indep): Move last element of mkdir rule here.
(mkdir): Remove rule.
2012-05-17 23:54:28 -07:00
Glenn Morris
37baa3c829 * Makefile.in (install-arch-indep): Remove unneeded chmods.
INSTALL_DATA does this for us.
2012-05-17 23:48:14 -07:00
Glenn Morris
b533f05ef5 Makefile simplifications related to creating installation directories
A separate mkdir rule is not needed, since MKDIR_P is thread-safe.

* Makefile.in (install-arch-dep): Ensure bindir exists.
Drop mkdir dependency.
(install-arch-indep): Ensure docdir, infodir, mandir exist.
(install-leim): Drop mkdir dependency.
(mkdir): Remove most directories, now made in relevant rules.
2012-05-17 23:46:05 -07:00
Glenn Morris
7606c36016 * Makefile.in (install-arch-indep): Combine adjacent loops. 2012-05-17 23:39:52 -07:00
Glenn Morris
d9a1e2c25f Simplify install-etc rule
* Makefile.in (install-etc, mkdir):
Make relevant directories in install-etc rather than mkdir.
2012-05-17 15:13:02 -04:00
Glenn Morris
4c54abe198 More simplification for installation of site-lisp directories
* Makefile.in (write_subdir): Create the directory if needed.
(install-arch-dep, mkdir): No need to make site-lisp directories.
2012-05-17 14:47:52 -04:00
Glenn Morris
05f3d308da Further simplify install-arch-dep for self-contained NS builds
* Makefile.in (install-arch-dep): Use $write_subdir.
2012-05-17 14:28:24 -04:00
Glenn Morris
9f1ea7dcd9 Reduce some code duplication in Makefile.in
* Makefile.in (write_subdir): New.
(install-arch-indep): Use $write_subdir.
2012-05-17 14:26:51 -04:00
Glenn Morris
40c117e7ad Minor optimization for install of self-contained NS info files
* configure.in (etcdir): For a self-contained ns build,
set it to the appropriate values.
* Makefile.in (install-arch-dep): No need to move info/ any more.
2012-05-16 23:07:26 -07:00
Glenn Morris
b42c720d56 Set more installation directories for self-contained ns builds
* configure.in (docdir, etcdir, lispdir):
For a self-contained ns build, set these to the appropriate values.
2012-05-16 22:55:29 -07:00
Glenn Morris
b4a3620021 Fix previous change, for NS builds that are not self-contained
* configure.in (ns_self_contained): New output variable.
* Makefile.in (ns_self_contained): New, set by configure.
(install-arch-dep): Use $ns_self_contained.
2012-05-16 22:32:37 -07:00
Glenn Morris
96182ae697 Minor optimization for install-arch-dep with self-contained ns build
* Makefile.in (install-arch-dep): For a self-contained ns build,
don't bother installing binaries then immediately deleting them.
2012-05-16 22:14:50 -07:00
Glenn Morris
3a4155de66 Install a self-contained NS build's libexec directly into the right place
This is rather than installing it in one place then moving it.

* configure.in (archlibdir): Set it for self-contained ns builds.
(libexecdir): Don't expand it now (this is mainly cosmetic).

* Makefile.in (ns_appbindir, ns_appresdir):
Move them before things that may refer to them.
(install-arch-dep): No need to relocate self-contained ns libexec.

* lib-src/Makefile.in (ns_appbindir): New, set by configure.
2012-05-16 21:23:03 -04:00
Paul Eggert
f04940ae9d * configure.in: Simplify by removing CPP etc.
(CPP_TEST_OPTIONS, NON_GNU_CPP, cc_specified, SPECIFIED_CFLAGS)
(SPECIFED_CPP, CPP, NON_GNU_CC, AC_PROG_CPP): Remove; not needed.
In particular we no longer need to fiddle with CPP, since we don't
use CPP specially any more.
(gl_EARLY): Invoke this after adjusting CC, so that it uses the
adjusted compiler.
(AC_PROG_INSTALL, AC_PROG_MKDIR_P, AC_PROG_RANLIB): Comment out,
since gl_EARLY and/or Autoconf already does these.
2012-05-16 02:01:55 -07:00
Glenn Morris
27cb7be27d Try to fix building with gcc >= 4.6 on Darwin.
Eg, hydra builds have been failing for some time because (?) of this.
In gcc < 4.6, unrecognized -no-fo options just cause a warning.
In 4.6 and later, they cause an error.

* configure.in: (CPP): Do not unconditionally set it on Darwin.
Instead, try to test if -no-cpp-precomp is accepted.
(CPP_TEST_OPTIONS, SPECIFIED_CPP): New.

Fixes: debbugs:9755
2012-05-15 23:15:52 -07:00
Glenn Morris
4e7d487c44 * Makefile.in (install-arch-dep): Replace last user of MV_DIRS. 2012-05-15 15:13:17 -04:00
Glenn Morris
c184265d03 * Makefile.in (install-arch-dep): Replace use of MV_DIRS with libexec. 2012-05-15 13:55:39 -04:00
Glenn Morris
a3f7efb87d * Makefile.in (install-arch-dep): Replace use of MV_DIRS with info.
This make it easier to see what is going on.
2012-05-15 13:49:59 -04:00
Glenn Morris
75a9f5f5b6 * Makefile.in (install-arch-dep): Do not hard-code version number. 2012-05-15 13:32:42 -04:00
Glenn Morris
ec3ca9ec47 Stop NS install symlinking libexec/* into bin/
* Makefile.in (install-arch-dep): NS install no longer needs to
symlink libexec/* into bin/, since 2012-05-14 ns_init_paths change.
2012-05-15 13:09:00 -04:00
Glenn Morris
9e6b06ed73 Remove trailing / from $ns_appbindir
* configure.in (ns_appbindir): Remove trailing "/".
* src/ns.mk: Update for ns_appbindir no longer having trailing "/".
2012-05-12 11:10:37 -07:00
Glenn Morris
3fe7cdc86d Let configure test for a suitable mkdir -p
* configure.in (AC_PROG_MKDIR_P): Call it, to set MKDIR_P.
(MKDEPDIR): Use $MKDIR_P.

* Makefile.in (MKDIR_P): New, set by configure.
(mkdir): Use $MKDIR_P.

* doc/emacs/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.

* doc/lispintro/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.

* doc/lispref/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.

* doc/misc/Makefile.in (MKDIR_P): New, set by configure.
(mkinfodir): Use $MKDIR_P.

* src/Makefile.in (MKDIR_P): New, set by configure.

* src/ns.mk (${ns_appdir}, ${ns_appbindir}Emacs): Use $MKDIR_P.
2012-05-11 20:57:48 -04:00
Glenn Morris
c8e321795a * Makefile.in (install-arch-indep): Remove dead code.
./lisp/simpl.ele never exists in the _build_ directory,
the Lisp files are always in the _source_ directory.
Even if they were not, it would be wrong to install just
*.el and *.elc, since there are subdirectories in lisp/.
2012-05-11 13:13:18 -04:00
Glenn Morris
e61249277b * Makefile.in (install-arch-indep): Use INSTALL_DATA for the DOC file. 2012-05-11 01:10:52 -07:00
Glenn Morris
a873f274ba * Makefile.in (install-arch-indep): There are no more Makefile.c files. 2012-05-11 00:51:31 -07:00
Glenn Morris
ff57c2ec02 Install self-contained ns leim files directly to their final destination
This is instead of installing them first in one place, then moving them.
It also fixes the previous change, which was incorrect for
the -disable-ns-self-contained case.

* configure.in (LEIM_INSTALLDIR): New output variable.

* leim/Makefile.in: (install_prefix): New.
(LEIM_INSTALLDIR): New, set by configure.
(install): Use LEIM_INSTALLDIR.
2012-05-09 20:40:20 -07:00
Stefan Monnier
49ed9c8e75 * lisp/vc/log-edit.el: Add GNU coding standards highlighting.
(log-edit-font-lock-gnu-style)
(log-edit-font-lock-gnu-keywords): New vars.
(log-edit-font-lock-keywords): New fun.
(log-edit-mode): Don't fold case in font-lock.
(log-edit-font-lock-keywords): Do not assume case-folding.
* .dir-locals.el (log-edit-mode): Enable gnu-style checks.
2012-05-08 11:19:18 -04:00
Glenn Morris
5122804afc Remove doc/lispref/two.el
* doc/lispref/two.el: Remove; unused since creation of two-volume.make.

* make-dist: No more doc/lispref/*.el.
2012-05-08 00:18:18 -07:00
Andreas Schwab
01319a4e67 * configure.in: Fix quoting bugs. 2012-05-05 12:34:06 +02:00
Glenn Morris
8045b9065f Give info files the .info extension
Ref http://lists.gnu.org/archive/html/emacs-devel/2012-04/msg00354.html

* configure.in (INFO_EXT, INFO_OPTS): New output variables.

* doc/emacs/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/emacs/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS): Use $INFO_EXT.
($(infodir)/emacs$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT, and -o.

* doc/lispintro/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
(${infodir}/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/lispintro/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS, clean): Use $INFO_EXT.
($(infodir)/eintr$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.

* doc/lispref/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(info, infoclean): Use $INFO_EXT.
($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.
* doc/lispref/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(info, maintainer-clean): Use $INFO_EXT.
($(infodir)/elisp$(INFO_EXT)): Use $INFO_EXT and $INFO_OPT.

* doc/misc/Makefile.in (INFO_EXT, INFO_OPTS): New, set by configure.
(INFO_TARGETS): Use $INFO_EXT.
Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o.
* doc/misc/makefile.w32-in (INFO_EXT, INFO_OPTS): New.
(INFO_TARGETS): Use $INFO_EXT.
Make all rules generating info files use $INFO_EXT, $INFO_OPT, and -o.
2012-05-03 23:45:03 -07:00
Glenn Morris
3c30e76668 configure.in tweak for LD_SWITCH_SYSTEM on FreeBSD, NetBSD (bug#10313)
* configure.in (LD_SWITCH_SYSTEM):
Don't try to defeat the choices made by FreeBSD and NetBSD.
2012-05-02 12:55:00 -04:00
Glenn Morris
a64fe9146e Yet more merged ChangeLog fixes 2012-05-02 09:28:03 -07:00
Glenn Morris
3d6af4d1f6 Fix merged ChangeLog entry 2012-05-02 09:14:20 -07:00
Glenn Morris
9aa071dfb9 Don't hard-code the list of info files in the top-level Makefile
The sed '/ing directory/d' piece is to remove the annoying
"entering/leaving directory" messages that GNU make insists on
printing when called recursively.  --no-print-directory isn't portable.

* Makefile.in (INFO_FILES): Remove variable.
(INFO_NONMISC): New variable.
(install-arch-indep, uninstall): Don't use $INFO_FILES.

* doc/misc/Makefile.in (echo-info): New phony target, used by top-level.
2012-05-02 00:45:16 -07:00
Glenn Morris
90207a1525 Merge from emacs-24; up to 2012-04-16T19:06:02Z!rgm@gnu.org 2012-05-02 00:20:29 -07:00
Glenn Morris
cd3771a08b * Makefile.in (uninstall): Remove useless-use-of-for.
For some reason it caused problems on an old Solaris.
2012-05-02 00:01:36 -07:00
Glenn Morris
a36e64d04b Makefile.in fix for systems without /bin/install or somesuch
* Makefile.in (install-arch-indep, uninstall):
Ensure that INSTALL-type commands are run from top-level.
2012-05-01 23:53:21 -07:00
Glenn Morris
3fef57a2f6 * Makefile.in (INFO_FILES): Add emacs-gnutls;
accidentally omitted from 2012-04-12 backport from trunk.
(Do not merge to trunk.)
2012-05-01 23:46:34 -07:00
Glenn Morris
7adecb9936 * Makefile.in (install-arch-indep): Combine install-data, install-info loops. 2012-05-01 22:10:43 -04:00
Glenn Morris
9e7a4bcfd8 Fix some info/dir entries
* doc/misc/emacs-gnutls.texi, doc/misc/ert.texi, doc/misc/org.texi:
Fix dircategory, direntry to match info/dir.

* doc/misc/viper.texi: Make direntry shorter (also it is no longer "newest").

* info/dir: Make some entries consistent with the source texi files.
2012-05-01 21:22:26 -04:00
Glenn Morris
9fa0e4168d * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.
Ref http://debbugs.gnu.org/6190
2012-05-01 20:11:24 -04:00
Glenn Morris
ab1121bd6d Don't hard-code manual pages in top-level Makefile.in
* Makefile.in (MAN_PAGES): Remove.
(install-arch-indep, uninstall): Don't use $MAN_PAGES.
2012-05-01 17:05:28 -04:00
Glenn Morris
a4a18b8bbe Use libtinfo in preference to libncurses (bug#9741)
* configure.in: Try libtinfo for tputs.
(LIBS_TERMCAP) [gnu*]: Use libtinfo if it was found.  

* etc/NEWS: Mention this.
2012-04-30 21:07:14 -04:00
Glenn Morris
3ba0a545ec * configure.in: Combine adjacent $opsys case blocks. 2012-04-30 20:56:47 -04:00
Glenn Morris
e3da5b1949 * configure.in (LIBS_TERMCAP): Remove unreachable branch for sol2. 2012-04-30 20:50:55 -04:00
Glenn Morris
262f06da76 * configure.in: Invert the TERMINFO logic
(since "yes" is far more common than "no")
2012-04-30 20:46:02 -04:00
Glenn Morris
9311dcff1d Remove HAVE_LIBNCURSES; it is required to be true
Also, it was a confusing name, since it does not necessarily mean that
we literally have libncurses; rather that we have tputs etc.

* configure.in (HAVE_LIBNCURSES): Remove; it is required to be true.

* src/dispnew.c: Remove HAVE_LIBNCURSES test;
it is always true on relevant platforms.

* nt/config.nt (HAVE_LIBNCURSES): Remove undef; not needed.
2012-04-30 20:30:11 -04:00
Glenn Morris
4d5c63499a Rename autoconf output variable LD_SWITCH_X_SITE_AUX_RPATH
* configure.in (LD_SWITCH_X_SITE_RPATH):
Rename from LD_SWITCH_X_SITE_AUX_RPATH.

* src/Makefile.in (LD_SWITCH_X_SITE_RPATH):
Rename from LD_SWITCH_X_SITE_AUX_RPATH.
2012-04-30 20:16:02 -04:00
Glenn Morris
4737362e43 Remove LD_SWITCH_X_SITE_AUX, which is no longer used
* configure.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used.
* src/Makefile.in (LD_SWITCH_X_SITE_AUX): Remove; no longer used.
2012-04-30 20:12:02 -04:00