1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-30 00:51:50 -08:00
Commit graph

542 commits

Author SHA1 Message Date
Andreas Schwab
57ae02b1db * Makefile.in (install-arch-indep): Avoid eval. 2012-07-31 09:58:08 +02:00
Paul Eggert
8f25abd317 Do not overwrite config.status while executing it.
* Makefile.in (MAKEFILE_NAME): New macro.
($(MAKEFILE_NAME)): Rename rule from Makefile.
* configure.ac (epaths): Set MAKEFILE_NAME to a bogus value,
so that GNU 'make' isn't tempted to make the Makefile and then
regenerate config.status while config.status is running.

Fixes: debbugs:11214
2012-07-30 13:34:58 -07:00
Paul Eggert
0aee69126f Update .PHONY listings in makefiles. 2012-07-30 09:20:35 -07:00
Jan Djärv
847bb9eb74 * Makefile.in (install-arch-indep): Remove sh -x. 2012-07-30 09:51:29 +02:00
Jan Djärv
ffd817eb10 * Makefile.in (install-arch-indep): Handle space in locallisppath.
* src/lread.c (init_lread): Remove if-statement in ifdef HAVE_NS before
setting sitelisp.

Fixes: debbugs:12010
2012-07-29 18:55:02 +02:00
Paul Eggert
c4444d16dc Rename configure.in to configure.ac.
Fixes: debbugs:11603
2012-07-08 21:52:49 -07:00
Glenn Morris
ca26824cb0 Make --no-site-lisp work for --enable-locallisppath elements
without "site-lisp" in the name.
Ref http://debbugs.gnu.org/10208#25, point iii).

* configure.in (standardlisppath): New output variable.
(lisppath): Use standardlisppath.
* Makefile.in (standardlisppath): New, set by configure.
(epaths-force): Use standardlisppath and locallisppath rather than lisppath.

* src/epaths.in (PATH_SITELOADSEARCH): New.
* src/lread.c (init_lread): Use PATH_SITELOADSEARCH.

* nt/paths.h (PATH_SITELOADSEARCH): New.

Fixes: debbugs:11658
2012-06-30 14:10:50 -07:00
Paul Eggert
501390c597 Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
It is confusingly named and rarely useful.  See, for example,
<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00089.html>.
* INSTALL.BZR: Don't mention --disable-maintainer-mode.
* Makefile.in (MAINTAINER_MODE_FLAG): Remove; all uses removed.
* configure.in: Remove --disable-maintainer-mode.
(USE_MAINTAINER_MODE, MAINT): Remove.
* admin/make-tarball.txt: Don't worry about maintainer mode.
* etc/NEWS: Mention this.
2012-06-01 11:26:21 -07:00
Paul Eggert
ec21c7f8ee * Makefile.in (ACLOCAL_INPUTS): Fix up gnulib-comp.m4 name. (Bug#11529)
Without this further fix, aclocal was being invoked unnecessarily.
2012-05-21 18:19:43 -07:00
Glenn Morris
39078e4aed More small tweaks for Makefile.in
* Makefile.in (blessmail, install-arch-dep, uninstall):
Check cd lib-src works.
(install-arch-dep, uninstall): Remove unneeded subshells.
2012-05-21 21:10:05 -04:00
Glenn Morris
ff0c3cfb2f * update-subdirs: Move to build-aux/.
* make-dist:
* Makefile.in (install-arch-indep):
* lisp/Makefile.in (update-subdirs):
* lisp/makefile.w32-in (update-subdirs-SH):
Update for this change.
2012-05-21 16:40:55 -04:00
Glenn Morris
d10cfddd07 Let the top-level Makefile install leim
* Makefile.in (leimdir): New, set by configure.
(COPYDIR, COPYDESTS): Add leim directories.
(install-leim): Remove.
(install-arch-indep): Handle leim installation directly.

* leim/Makefile.in (install): Remove, let top-level do it.
(version, prefix, datarootdir, datadir, ns_appresdir, leimdir):
(MKDIR_P, GZIP_PROG): Remove, no longer used.
2012-05-21 16:13:49 -04:00
Paul Eggert
9b4ee6166f Make merging from gnulib a script, not a makefile action.
Putting it in a makefile has some problems with reflection, as
merging from gnulib updates 'configure', which can update the makefile.
Putting it in a standalone script breaks this loop.
* Makefile.in (gnulib_srcdir, $(gnulib_srcdir), DOS_gnulib_comp.m4)
(GNULIB_MODULES, GNULIB_TOOL_FLAGS, sync-from-gnulib):
Remove, moving the actions to the script admin/merge-gnulib.
* admin/merge-gnulib: New script, with actions moved here from
../Makefile.in.
2012-05-20 19:33:13 -07:00
Glenn Morris
b847032c75 Command substitution already runs in a subshell
* Makefile.in (install-arch-indep, install-doc, install-info, uninstall):
* leim/Makefile.in (leim-list.el, install):
* lib-src/Makefile.in (insrcdir, $(DESTDIR)${archlibdir}):
* lisp/Makefile.in (setwins, setwins_almost, setwins_for_subdirs):
* test/automated/Makefile.in (setwins):
Scrap superfluous subshells.
2012-05-20 17:44:34 -07:00
Glenn Morris
567739fbcb Comments 2012-05-19 12:17:04 -07:00
Glenn Morris
41a2ce39fa Comments 2012-05-19 12:04:50 -07:00
Ulrich Mueller
af006ad50e * Makefile.in (install-etc): Respect DESTDIR.
Fixes: debbugs:11518
2012-05-19 11:57:10 -07:00
Glenn Morris
afdc347740 Undo part of previous change, in case it makes command line too long 2012-05-19 11:47:39 -07:00
Glenn Morris
e39b980633 * Makefile.in (install-arch-indep): Remove unneeded subshell.
Combine some rm commands.
2012-05-19 00:20:16 -07:00
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