Commit Graph

8 Commits

Author SHA1 Message Date
Bastien Guerry 5c9006de49 Revert "Fix previous commit."
This reverts commit 5f9177ad3a.
2012-10-03 12:13:33 +02:00
Bastien Guerry 7dd847c685 Revert "mk/default.mk: Restore datadir."
This reverts commit ded873cb8f.
2012-10-03 12:12:59 +02:00
Bastien Guerry ded873cb8f mk/default.mk: Restore datadir. 2012-10-03 12:04:51 +02:00
Bastien Guerry 5f9177ad3a Fix previous commit. 2012-10-02 17:38:41 +02:00
Bastien Guerry 5dcca72011 Use org-loaddefs.el instead of org-install.el. 2012-10-02 11:30:24 +02:00
Achim Gratz ba9606e6e1 Makefile: do not attempt to show Org version from Emacs' perspective
* mk/targets.mk: Remove invocation of $(SHOWVER).  Emacs does some
  stupid ioctl when org-fixup gets invoked and messes up the output.

* mk/default.mk: Remove definition of $(SHOWVER).
2012-09-29 11:49:58 +02:00
Achim Gratz e6228c448e Makefile: implement target config-version
* mk/targets.mk: Implement target `config-version´ to show the version
  of Org from both make's and Emacs' perspective.  Run that target at
  the end of all `config-*´ targets.

* mk/default.mk: Add SHOWVER with the appropriate invocation of emacs
  to output the Org version.

* Makefile: Document new target `config-version´ in `helpall´.
2012-09-29 10:47:40 +02:00
Achim Gratz bf352eceda Rename utils/ to mk/, move some files to mk/ and make the requisite changes throughout
* Makefile: Include default.mk and targets.mk from mk/ where they've
  been moved to.

* README_maintainer: Rename utils to make throughout.

* doc/Makefile: Rename utils to make throughout.

* doc/org.texi: Remove reference to utils/, x11idle.c is now in
  contrib/scripts.

* mk/make_emacs_changelog: Add mk/ to list of directories not to be
  reported in Emacs' ChangeLog.  Also retain utils/ and re-add
  UTILITIES; add a comment explaining why these need to stay.

* mk/default.mk: Rename utils to make throughout.  Include version.mk
  from mk/ where it's been moved to.

* mk/targets.mk: Rename utils to make throughout.

* mk/server.mk: Rename utils to make throughout.  Only put those files
  from mk/ into the archives that are needed outside the server:
  default.mk targets.mk version.mk and org-fixup.el.

* lisp/org-compat.el: Rename utils to make throughout.

* .gitignore:  Rename utils to make throughout.
2012-08-26 15:27:19 +02:00