From fe599cfe8851e19c32a875724feb4ced4ed334fc Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 26 Aug 2012 14:03:20 +0200 Subject: [PATCH 1/2] Makefile: fix location of default.mk in org-fixup.el * mk/org-fixup.el: Fix location of default.mk, now in mk/default.mk. --- mk/org-fixup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/org-fixup.el b/mk/org-fixup.el index c8aff502a..fcf475322 100644 --- a/mk/org-fixup.el +++ b/mk/org-fixup.el @@ -114,7 +114,7 @@ Convenience function for easier invocation from command line." (defun org-make-local-mk () "Internal function for the build system." - (let ((default "default.mk") + (let ((default "mk/default.mk") (local "local.mk")) (unwind-protect (with-temp-buffer From ac0667b8412033590ca0b199b415cce75dfd89fa Mon Sep 17 00:00:00 2001 From: Achim Gratz Date: Sun, 26 Aug 2012 14:03:20 +0200 Subject: [PATCH 2/2] Makefile: add description of ORG_ADD_CONTRIB to info documentation * doc/org.texi: Add description of ORG_ADD_CONTRIB to info documentation. Add link to Worg for more details. --- doc/org.texi | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/org.texi b/doc/org.texi index 8107e004b..e1f3812e6 100644 --- a/doc/org.texi +++ b/doc/org.texi @@ -932,13 +932,19 @@ Then add the following line to @file{.emacs}: @end example @noindent -If you plan to use code from the @file{contrib} subdirectory, do a similar -step for this directory: +If you plan to use code from the @file{contrib} subdirectory without +compiling them, do a similar step for this directory: @example (add-to-list 'load-path "~/path/to/orgdir/contrib/lisp") @end example +If you want to include those files with the build and install, please +customize the variable @code{ORG_ADD_CONTRIB} instead in your @code{local.mk} +file, for more details please see this +@uref{http://orgmode.org/worg/dev/org-build-system.html#sec-4-1-2, +description on Worg}. + Installing Info files is system dependent, because of differences in the @file{install-info} program. The Info documentation is installed together with the rest of Org mode. If you don't install Org mode, it is possible to