with attachment ;)
>From 24f99a2ebd3de464fdb60902f003b828c2f71003 Mon Sep 17 00:00:00 2001
From: Eric Schulte <schulte.e...@gmail.com>
Date: Tue, 29 Jun 2010 15:53:15 -0700
Subject: [PATCH] update Makefile for correct instillation of Babel files
---
Makefile | 157 ++++++++++++++++++++++++++++++++-----------------------------
1 files changed, 82 insertions(+), 75 deletions(-)
diff --git a/Makefile b/Makefile
index c767cbd..6641395 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@ EMACS=emacs
prefix=/usr/local
# Where local lisp files go.
-lispdir = $(prefix)/share/emacs/site-lisp
+lispdir = $(prefix)/share/emacs/site-lisp
+lispbdir = $(lispdir)/babel
# Where info files go.
infodir = $(prefix)/share/info
@@ -62,77 +63,79 @@ INSTALL_INFO=install-info
##----------------------------------------------------------------------
# The following variables need to be defined by the maintainer
-LISPF = org.el \
- org-agenda.el \
- org-ascii.el \
- org-attach.el \
- org-archive.el \
- org-bbdb.el \
- org-beamer.el \
- org-bibtex.el \
- org-capture.el \
- org-clock.el \
- org-colview.el \
- org-colview-xemacs.el \
- org-compat.el \
- org-crypt.el \
- org-ctags.el \
- org-datetree.el \
- org-docview.el \
- org-entities.el \
- org-exp.el \
- org-exp-blocks.el \
- org-docbook.el \
- org-faces.el \
- org-feed.el \
- org-footnote.el \
- org-freemind.el \
- org-gnus.el \
- org-habit.el \
- org-html.el \
- org-icalendar.el \
- org-id.el \
- org-indent.el \
- org-info.el \
- org-inlinetask.el \
- org-jsinfo.el \
- org-irc.el \
- org-latex.el \
- org-list.el \
- org-mac-message.el \
- org-macs.el \
- org-mew.el \
- org-mhe.el \
- org-mks.el \
- org-mobile.el \
- org-mouse.el \
- org-publish.el \
- org-plot.el \
- org-protocol.el \
- org-remember.el \
- org-rmail.el \
- org-src.el \
- org-table.el \
- org-taskjuggler.el \
- org-timer.el \
- org-vm.el \
- org-w3m.el \
- org-wl.el \
- org-xoxo.el \
- babel/ob.el \
- babel/ob-table.el \
- babel/ob-lob.el \
- babel/ob-ref.el \
- babel/ob-exp.el \
- babel/ob-tangle.el \
- babel/ob-comint.el \
- babel/ob-keys.el \
- babel/langs/ob-emacs-lisp.el
+LISPF = org.el \
+ org-agenda.el \
+ org-ascii.el \
+ org-attach.el \
+ org-archive.el \
+ org-bbdb.el \
+ org-beamer.el \
+ org-bibtex.el \
+ org-capture.el \
+ org-clock.el \
+ org-colview.el \
+ org-colview-xemacs.el \
+ org-compat.el \
+ org-crypt.el \
+ org-ctags.el \
+ org-datetree.el \
+ org-docview.el \
+ org-entities.el \
+ org-exp.el \
+ org-exp-blocks.el \
+ org-docbook.el \
+ org-faces.el \
+ org-feed.el \
+ org-footnote.el \
+ org-freemind.el \
+ org-gnus.el \
+ org-habit.el \
+ org-html.el \
+ org-icalendar.el \
+ org-id.el \
+ org-indent.el \
+ org-info.el \
+ org-inlinetask.el \
+ org-jsinfo.el \
+ org-irc.el \
+ org-latex.el \
+ org-list.el \
+ org-mac-message.el \
+ org-macs.el \
+ org-mew.el \
+ org-mhe.el \
+ org-mks.el \
+ org-mobile.el \
+ org-mouse.el \
+ org-publish.el \
+ org-plot.el \
+ org-protocol.el \
+ org-remember.el \
+ org-rmail.el \
+ org-src.el \
+ org-table.el \
+ org-taskjuggler.el \
+ org-timer.el \
+ org-vm.el \
+ org-w3m.el \
+ org-wl.el \
+ org-xoxo.el
+
+LISPBF = ob.el \
+ ob-table.el \
+ ob-lob.el \
+ ob-ref.el \
+ ob-exp.el \
+ ob-tangle.el \
+ ob-comint.el \
+ ob-keys.el
LISPFILES0 = $(LISPF:%=lisp/%)
LISPFILES = $(LISPFILES0) lisp/org-install.el
+LISPBFILES = $(LISPBF:%=lisp/babel/%)
ELCFILES0 = $(LISPFILES0:.el=.elc)
ELCFILES = $(LISPFILES:.el=.elc)
+ELCBFILES = $(LISPBFILES:.el=.elc)
DOCFILES = doc/org.texi doc/org.pdf doc/org doc/dir \
doc/pdflayout.sty doc/.nosearch \
doc/orgguide.texi doc/orgguide.pdf
@@ -148,9 +151,9 @@ SHELL = /bin/sh
DISTFILES_extra= Makefile ChangeLog request-assign-future.txt contrib
DISTFILES_xemacs= xemacs/noutline.el xemacs/ps-print-invisible.el xemacs/README
-default: $(ELCFILES)
+default: $(ELCFILES) $(ELCBFILES)
-all: $(ELCFILES) $(INFOFILES)
+all: $(ELCFILES) $(ELCBFILES) $(INFOFILES)
up2: update
sudo ${MAKE} install
@@ -160,7 +163,7 @@ update:
${MAKE} clean
${MAKE} all
-compile: $(ELCFILES0)
+compile: $(ELCFILES0) $(ELCBFILES)
install: install-lisp
@@ -172,10 +175,13 @@ p:
g:
${MAKE} pdf && open doc/orgguide.pdf
-install-lisp: $(LISPFILES) $(ELCFILES)
+install-lisp: $(LISPFILES) $(LISPBFILES) $(ELCFILES)
if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
- $(CP) $(LISPFILES) $(lispdir)
- $(CP) $(ELCFILES) $(lispdir)
+ if [ ! -d $(lispbdir) ]; then $(MKDIR) $(lispbdir); else true; fi ;
+ $(CP) $(LISPFILES) $(lispdir)
+ $(CP) $(ELCFILES) $(lispdir)
+ $(CP) $(LISPBFILES) $(lispbdir)
+ $(CP) $(ELCBFILES) $(lispbdir)
install-info: $(INFOFILES)
if [ ! -d $(infodir) ]; then $(MKDIR) $(infodir); else true; fi ;
@@ -191,11 +197,11 @@ install-noutline: xemacs/noutline.elc
autoloads: lisp/org-install.el
-lisp/org-install.el: $(LISPFILES0) Makefile
+lisp/org-install.el: $(LISPFILES0) $(LISPBFILES) Makefile
$(BATCH) --eval "(require 'autoload)" \
--eval '(find-file "org-install.el")' \
--eval '(erase-buffer)' \
- --eval '(mapc (lambda (x) (generate-file-autoloads (symbol-name x))) (quote ($(LISPFILES0))))' \
+ --eval '(mapc (lambda (x) (generate-file-autoloads (symbol-name x))) (quote ($(LISPFILES0) $(LISPBFILES))))' \
--eval "(insert \"(add-to-list 'load-path (expand-file-name \\\"babel\\\" (file-name-directory (or (buffer-file-name) load-file-name))))\")" \
--eval "(insert \"\n(add-to-list 'load-path (expand-file-name \\\"langs\\\" (expand-file-name \\\"babel\\\" (file-name-directory (or (buffer-file-name) load-file-name)))))\")\n" \
--eval '(insert "\n(provide (quote org-install))\n")' \
@@ -268,6 +274,7 @@ distfile:
$(MKDIR) org-$(TAG)/doc
$(MKDIR) org-$(TAG)/lisp
cp -r $(LISPFILES) org-$(TAG)/lisp
+ cp -r $(LISPBFILES) org-$(TAG)/lisp/babel
cp -r $(DOCFILES) $(CARDFILES) org-$(TAG)/doc
cp -r $(DISTFILES_extra) org-$(TAG)/
cp -r README_DIST org-$(TAG)/README
--
1.7.0.4
"Eric Schulte" <schulte.e...@gmail.com> writes:
> Hi all,
>
> "Eric Schulte" <schulte.e...@gmail.com> writes:
>
>> Hi Matt,
>>
>> Thanks for raising the point about potentially dangerous code blocks.
>>
>> Matt Lundin <m...@imapmail.org> writes:
>
> [...]
>
>>>
>>> Also, with make install, the ob-* files are installed on the same
>>> level as the org-files, yet lines 108-114 in org.el indicate that they
>>> should be installed in a babel subdirectory.
>>>
>>
>> Looks like it may be necessary to move ob-* files out of LISPF and into
>> their own new Makefile variable, so they can be handled separately and
>> placed into a babel sub-directory.
>>
>
> I *believe* I've successfully made this change to the Makefile. It
> looks like the babel files are now installed into their own "babel"
> subdirectory of the global lisp directory.
>
> I hardly believe this worked since it is the product of naive Makefile
> pattern matching (which has never worked for me in the past), however it
> appears to be compiling on my system.
>
> If someone who actually uses "make install" on their system (or is
> confident writing Makefiles) can confirm that this patch works then I'll
> apply it.
>
> Thanks -- Eric
_______________________________________________
Emacs-orgmode mailing list
Please use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode
