1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-29 16:41:45 -08:00
Commit graph

590 commits

Author SHA1 Message Date
Eli Zaretskii
a9519e2685 Merge from trunk. 2013-05-16 12:58:56 +03:00
Stefan Monnier
6e911150d0 Use just DOC instead of DOC-nn.mm.
* lisp/loadup.el: Just use unversioned DOC.
* Makefile.in (install-doc): DOC file is not version specific any more.
* .bzrignore: Don't ignore DOC-* any more.
* admin/quick-install-emacs: Don't prune DOC-* files a any more.
* doc/lispref/loading.texi (Autoload):
* doc/lispref/help.texi (Documentation Basics, Accessing Documentation)
(Accessing Documentation, Accessing Documentation): DOC-* is now DOC.
* etc/.gitignore: Don't ignore DOC-* any more.
* lib-src/makefile.w32-in ($(DOC)): Use DOC rather than DOC-X.
* msdos/sed1x.inp: Don't rewrite DOC any more.
* nt/makefile.w32-in (clean, top-distclean): DOC-X doesn't exist any more.
* src/Makefile.in (bootstrap-clean): DOC-* doesn't exist any more.
* src/makefile.w32-in (DOC): Use just "DOC".
2013-05-15 16:12:53 -04:00
Eli Zaretskii
da53c452e5 Separated Windows specific install and uninstall targets as suggested by Paul Eggert. 2013-04-18 19:49:58 +03:00
Eli Zaretskii
4f0e6095fc Merge from trunk. 2013-04-18 19:20:48 +03:00
Glenn Morris
4f8902cd02 Replace AC_PROG_LN_S by a less strict configure test
* configure.ac (AC_PROG_LN_S): Remove, too restrictive.
(LN_S_FILEONLY): New output variable.
* Makefile.in (LN_S): Remove.
(LN_S_FILEONLY): New, set by configure.
(install-arch-dep): Use LN_S_FILEONLY rather than LN_S.
2013-04-17 22:03:53 -07:00
Eli Zaretskii
224e1caae1 Teach 'make' how to re-configure for MinGW. 2013-04-17 22:42:10 +03:00
Eli Zaretskii
f576f7fb04 Fixed the LN_S and LN_EMACS issue. 2013-04-17 20:51:31 +03:00
Eli Zaretskii
6454498502 Avoid building blessmail and use hard links when installing emacs.exe. 2013-04-14 19:36:49 +03:00
Eli Zaretskii
d6db9fd60a Fixed src/epaths.h generation and lib-src dependencies and libraries. 2013-04-06 16:25:17 +03:00
Eli Zaretskii
030a1c5ea6 Fixed nt/Makefile.in and top-level Makefile.in.
Programs in nt/ and lib-src/ compile and link.
Warnings and errors in src/.
2013-04-01 17:35:26 +03:00
Eli Zaretskii
095bf25383 Added nt/Makefile.in and appropriate tweaks to configure.ac.
Added emacsclient.res support to lib-src/.
Fixed temacs and dumping commands in src/Makefile.in.
Miscellaneous fixes all over the place.

Not tried to build yet.
2013-04-01 16:18:20 +03:00
Paul Eggert
4c9a137782 Fix bug when building Emacs with a GNU Make submake.
* Makefile.in (QUIET_SUBMAKE): New macro.
(install-info, uninstall): Use it.

Fixes: debbugs:13962
2013-03-18 14:02:34 -07:00
Glenn Morris
28b6b84d4e Merge from emacs-24; up to 2012-12-24T15:56:17Z!eliz@gnu.org 2013-03-04 19:59:35 -08:00
Glenn Morris
b3cdfd9e06 * Makefile.in (install-man): Ignore gzip exit status. 2013-03-04 19:43:52 -08:00
Paul Eggert
b59a2e9edb Parallelize documentation builds.
This speeds up building of documentation on multiprocessor
platforms, and is motivated by Texinfo 5.0, which is much slower.
Add a toplevel rule 'make docs' to make all the documentation.
* .bzrignore: Add .dvi, .html, .ps.
* Makefile.in (DVIS, HTMLS, INFOS, PSS, DOCS): New macros.
($(DOCS), docs, vi, html, pdf, ps): New rules.
(info-real): Depend on $(INFOS) rather than doing it sequentially.
(dvi): Depend on $(DVIS) rather than doing it sequentially.
* doc/misc/Makefile.in (html): New rule.
2013-02-21 14:42:56 -08:00
Glenn Morris
795e7a5b32 Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru 2013-01-19 12:38:13 -08:00
Glenn Morris
94898d72a3 * Makefile.in (install-arch-indep): Put back a chmod
that was removed 2012-05-19.  (Bug#13430)
2013-01-15 20:41:31 -05:00
Paul Eggert
0877d0dc24 Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca 2013-01-02 08:13:04 -08:00
Paul Eggert
ab422c4d68 Update copyright notices for 2013. 2013-01-01 09:11:05 +00:00
Glenn Morris
a4b0cca119 Merge from emacs-24; up to 2012-12-01T13:25:13Z!cyd@gnu.org 2012-12-21 11:32:43 -08:00
Akinori MUSHA
018246572c * Makefile.in (install-arch-dep): Ignore chmod errors (tiny change)
Fixes: debbugs:13233
2012-12-19 23:56:56 -08:00
Glenn Morris
727f973937 Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org 2012-12-12 21:29:15 -08:00
Andreas Schwab
0f59daafb7 * Makefile.in (install-info): Use `${MAKE} -s' for echo-info.
(uninstall): Likewise.
2012-12-12 18:52:01 +01:00
Nicolas Avrutin
02925206eb Fix for install-info in non-English locales (tiny change)
* Makefile.in (install-info, uninstall):
Ensure make's messages about changing directories are in English.

Fixes: debbugs:13142
2012-12-11 13:37:53 -05:00
Glenn Morris
d036bcdffe Allow choice of icon style at install time
This feature is intentionally not advertised
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12536#40

* Makefile.in (EMACS_ICON): New variable.
(install-etc): Use EMACS_ICON to allow choice of icon.
2012-11-02 18:22:11 -04:00
Glenn Morris
59696ae01c * Makefile.in (EMACS_NAME): New variable.
(EMACS, install-etc, uninstall): Use $EMACS_NAME.
2012-10-26 14:35:36 -04:00
Glenn Morris
eeced60b6c Program name transformations should not be applied to $EXEEXT.
* Makefile.in (EMACS, EMACSFULL):
* lib-src/Makefile.in (install, uninstall):
Transformations should not be applied to $EXEEXT.
2012-10-26 00:39:47 -07:00
Glenn Morris
25ca458727 Misc fixes for make uninstall
* Makefile.in (uninstall): Don't abort if some directories are missing.
Apply transformation rules to manual pages, desktop and icon files.
No more emacs22 icons to uninstall.
2012-10-26 00:32:40 -07:00
Glenn Morris
8bfcb8a6a8 * Makefile.in (install-etc): Don't apply program transform to file suffixes. 2012-10-24 13:25:24 -04:00
Glenn Morris
a6c2cc07fc * Makefile.in (install-man): Don't apply transform to suffix. 2012-10-24 09:41:59 -07:00
Glenn Morris
ed68379ea9 Revert 2012-10-21 Makefile.in change (bug#12713)
* Makefile.in (emacs_transform): Remove.
(install-man): Revert 2012-10-21 change.
2012-10-23 13:33:22 -04:00
Glenn Morris
ad483434e5 Put back old Emacs 22 icons, just don't install them
Some people prefer them to the newer icon

* Makefile.in (install-etc): Don't install emacs22 icons.

* etc/images/icons/hicolor/32x32/apps/emacs22.png:
* etc/images/icons/hicolor/16x16/apps/emacs22.png:
* etc/images/icons/hicolor/48x48/apps/emacs22.png:
* etc/images/icons/hicolor/24x24/apps/emacs22.png: Restore old icons.

* etc/images/icons/README: Restore info about emacs22 icons
2012-10-20 18:35:46 -07:00
Glenn Morris
8dc2a723eb In Makefile.in, use a make variable rather than a shell variable.
* Makefile.in (emacs_transform): New variable.
(install-etc): Prefer a make variable to a shell variable.
2012-10-20 18:27:09 -07:00
Stefan Monnier
90eacf9920 * lisp/emacs-lisp/gv.el (cond): Same fix as before for `if'.
* Makefile.in ($(MAKEFILE_NAME)): Depend on src/lisp.mk as well.
2012-10-18 08:56:10 -04:00
Glenn Morris
293902c8b2 (install-etc): Fix previous change 2012-10-15 17:57:20 -04:00
Glenn Morris
1a9c683079 Apply program-transform-name etc in more places (bug#12536#34)
* Makefile.in (install-man, install-etc): Apply $TRANSFORM.  
(clean): Delete etc/emacs.tmpdesktop.

* .bzrignore: Add etc/emacs.tmpdesktop.

* etc/NEWS: Mention this.  Unrelated copyedits.
2012-10-15 16:56:07 -04:00
Bastien Guerry
78819a9ff8 Partially revert previous commit.
The help: target for the Makefile was just meant as a local test.
2012-09-30 00:01:57 +02:00
Bastien Guerry
04558d31ab url-util.el: Fix two docstrings. 2012-09-29 22:45:44 +02:00
Paul Eggert
c462dda8c8 * Makefile.in (bootstrap): Set MAKEFILE_NAME when building Makefile,
to avoid problems with recursion when using GNU make.
2012-09-23 02:18:24 -07:00
Paul Eggert
bbe099e709 * Makefile.in (bootstrap): Simplify build procedure.
Suggested by Wolfgang Jenker in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00456.html>.
2012-09-22 03:59:13 -07:00
Andreas Schwab
d3612ac370 * Makefile.in (bootstrap): Revert last change. Run config.status
after config.status --recheck, run configure from $(srcdir).
(config.status): Run configure from $(srcdir).
2012-09-18 00:43:12 +02:00
Paul Eggert
dee26dfa11 * Makefile.in: Run autogen/copy_autogen if autogen.sh fails,
to create 'configure'; problem reported by Andreas Schwab in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00438.html>.
* autogen.sh: Exit with status 1 when failing due to missing tools,
reverting the 2012-09-10 change to this file.
* autogen/copy_autogen: Fail if one of the subsidiary actions fail.
Use 'cp -f' for the build-aux files, since the destinations are
typically read-only.
2012-09-17 15:35:28 -07:00
Paul Eggert
50bfc8243c * Makefile.in: Fix build error on FreeBSD.
($(MAKEFILE_NAME)): Pass MAKE='$(MAKE)' to config.status's env.
Suggested by Wolfgang Jenker in
<http://lists.gnu.org/archive/html/emacs-devel/2012-09/msg00430.html>.
(MAKE_CONFIG_STATUS): Remove.  Remaining use expanded.
This undoes part of the 2012-09-10 patch.
(bootstrap): Run ./configure, rather than trying to run config.status
if it exists.  That builds src/epaths.h more reliably.
2012-09-17 14:33:14 -07:00
Glenn Morris
83da1b5565 Increase compartmentalization of Nextstep builds rules,
and store Emacs version number in fewer versioned files.

* configure.ac (ns_appsrc): Use relative names.
(ns_frag): Remove.
(Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings)
(nextstep/Makefile): Generate these nextstep files.
(SUBDIR_MAKEFILES): Add nextstep.

* Makefile.in (clean, distclean, bootstrap-clean): Add nextstep.

* make-dist (nextstep/templates): Add directory.
(nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove.
(nextstep/Cocoa/Emacs.base/Contents)
(nextstep/GNUstep/Emacs.base/Resources): Update contents.

* .bzrignore: Add some nextstep files.

* admin/admin.el (set-version): No more need to set nextstep versions.
(set-copyright): Update for moved nextstep files.

* nextstep/Makefile.in: New file.
* nextstep/templates: New directory.
* nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in:
* nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in:
Move here from various Cocoa/, GNUstep/ locations.
Let configure set the version number.
* nextstep/Cocoa/Emacs.base/Contents/Info.plist:
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings:
* nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist:
* nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/.
* nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory.

* src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables.
(ns_frag): Remove.
(ns-app): Move here from ns.mk, and simplify.
(clean): Simplify nextstep entry.
* src/ns.mk: Remove file.
2012-09-16 11:49:00 -07:00
Glenn Morris
9d9edd4bae Be more explicit about some Makefile dependencies
* Makefile.in (install-arch-dep, install-arch-indep, install-doc):
Be more explicit about dependencies, for parallel `make install'.

It is not so unreasonable to run `make -j# install' from a clean state
for a self-contained NS build, where the "installation" happens within
the build tree.
2012-09-11 00:45:38 -07:00
Paul Eggert
b8b0239fd0 Improve robustness of 'make bootstrap'.
Run autogen.sh after bootstrap-clean, to avoid bzr pull issues.
* INSTALL, README: Document autogen.sh.
* Makefile.in (Makefile): Mark it as precious, since it's updated
atomically.
(MAKE_CONFIG_STATUS): New macro.
(config.status, bootstrap): Use it.  This causes 'make bootstrap'
to run config.status with the --recheck option, which is more
appropriate for a bootstrap.
(bootstrap): Run autogen.sh right after cleaning.  Don't worry
about failures due to missing tools.
* autogen.sh: Exit with status 101 when failing due to missing tools.
* make-dist: Distribute autogen.sh.

Fixes: debbugs:12376
2012-09-09 18:03:27 -07:00
Glenn Morris
5af9cb6be0 Add option to not create bin/emacs link to bin/emacs-VERSION
* Makefile.in (install-arch-dep): If NO_BIN_LINK is non-null,
do not create the bin/emacs link. 

* etc/NEWS: Mention this.

Fixes: debbugs:12011
2012-08-21 23:55:44 -07:00
Glenn Morris
9aa0092cdd Use symlink in installed bin/ directory, where supported
* configure.ac (AC_PROG_LN_S): Test for ln.

* Makefile.in (LN_S): New, set by configure.
(install-arch-dep): Use $LN_S.
2012-08-20 18:12:35 -04:00
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