Commit Graph

823 Commits

Author SHA1 Message Date
Glenn Morris
42d5aa3efc * Makefile.in (install-arch-indep): Remove unneeded chmod.
Set permissions of lisp/subdirs.el.
2012-05-18 23:45:24 -07:00
Glenn Morris
9192d37dc5 * Makefile.in (SUBDIR): Add leim. Update users. 2012-05-18 23:42:26 -07:00
Glenn Morris
2e5d41e4a7 * Makefile.in (lib, lib-src, lisp): Check cd return value. 2012-05-18 23:36:25 -07:00
Glenn Morris
e7333757bf * Makefile.in (leim): No need to set PARALLEL.
This predates the use of changed.misc etc to serialize the leim build.
The leim Makefile used to set .NO_PARALLEL/.NOTPARALLEL for the same
reason, but has not done so for many years.
2012-05-18 23:34:59 -07:00
Glenn Morris
6d1a623ec4 Further small Makefile install simplifications
* Makefile.in (install-arch-indep, install-info, install-man):
Simplify some one-sided ifs.
2012-05-18 19:15:11 -04:00
Glenn Morris
2947339364 * Makefile.in: Install only the relevant DOC file.
This only affects in-tree builds where you have several versions
emacs-24.1.50.1, .2, etc lying around.

* Makefile.in: (install-arch-indep): Delete etc/DOC*.
(install-doc): No more need to delete etc/DOC.
2012-05-18 14:40:19 -04:00
Glenn Morris
bfed833481 Fix up dependencies in previous change.
install-arch-indep deletes the entire destination etc/ directory,
so install-doc needs that to be run first.
2012-05-18 14:19:37 -04:00
Glenn Morris
660c8c1e9a * Makefile.in (install-arch-indep): Split into several rules.
(install-doc, innstall-info, install-man): New rules.
2012-05-18 13:56:08 -04:00
Glenn Morris
568c6157f3 Minor fix for previous change. 2012-05-18 13:40:13 -04:00
Glenn Morris
6b3868cb14 Reposition previous change 2012-05-18 00:44:13 -07:00
Glenn Morris
0629a797a1 Avoid installation followed by immediate deletion for self-contained ns
* configure.in (INSTALL_ARCH_INDEP_EXTRA): New output variable.
* Makefile.in (INSTALL_ARCH_INDEP_EXTRA): New, set by configure.
(install-arch-indep): Don't install-etc for self-contained ns builds.
2012-05-18 00:41:13 -07:00
Glenn Morris
b7e1feeab6 * Makefile.in (install-arch-indep): Minor fix for earlier change. 2012-05-18 00:34:10 -07:00
Glenn Morris
1fb4fc6005 Remove some old comments 2012-05-18 00:06:23 -07:00
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
904769baa9 * Makefile.in (install-etc): Fix previous change.
Remember to always call MKDIR_P and INSTALL_DATA from the top-level
directory, for the case in which we are falling back to build-aux/install-sh.
It would make life much easier if autoconf would use an absolute path
in this case.
2012-05-17 15:30:42 -04: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
53a84f3c9e * Makefile.in (write_subdir): Move definition before use. 2012-05-17 14:38:20 -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
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
Glenn Morris
033cdda60a Tweak line-breaks in previous change 2012-05-15 15:17:24 -04: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
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
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
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
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
Paul Eggert
9f46df23a3 Merge from trunk; add Bug#. 2012-04-09 12:51:06 -07:00
Ted Zlatanov
6b4f4a2d6b Add documentation for the Emacs GnuTLS integration.
* info/dir (File):
* Makefile.in: Add emacs-gnutls to the info directory and the
INFO_FILES target.

* doc/misc/emacs-gnutls.texi: Add documentation for the GnuTLS integration.

* doc/misc/gnutls.texi: New file to explain the GnuTLS integration.

* doc/misc/Makefile.in: Add gnutls.texi to build.
2012-04-09 09:10:22 -04:00
Paul Eggert
b8df54ffbe configure: new option --enable-gcc-warnings
I have been using this change for many months in my private copy
of Emacs, and have used it to find several bugs.  It's mature
enough to publish now.
* Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
* configure.in: Support --enable-gcc-warnings, in the style of
other GNU packages such as coreutils.
(C_WARNINGS_SWITCH): Remove, replacing with...
(WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
(PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
when including system files with GCC.
* etc/NEWS: Mention --enable-gcc-warnings.
* lib/Makefile.am (AM_CFLAGS): New macro.
* m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
* lib-src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(BASE_CFLAGS): Use new macros rather than old.
* lwlib/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* oldXMenu/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/Makefile.in (C_WARNINGS_SWITCH): Remove.
(WARN_CFLAGS, WERROR_CFLAGS): New macros.
(ALL_CFLAGS): Use new macros rather than old.
* src/process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
* src/regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
-Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
-Wunused-result, -Wunused-variable.  This should go away once
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 00:45:59 -07:00
Glenn Morris
fd9d85c2d2 Small changes for top-level Makefile
* Makefile.in (leim): Check cd return value.  Pass fewer variables.
(install-leim): Check cd return value.  Pass $MFLAGS.
(install-strip): Pass $MFLAGS.
2012-04-08 23:40:20 -07:00