Re: [O] The Org->ODT exporter is now in Org's core (latest git)

[Dave Marquardt]

Dave Marquardt <address@hidden> writes:

> Dave Marquardt <address@hidden> writes:
>
>> Jambunathan K <address@hidden> writes:
>>
>>> Dave Marquardt <address@hidden> writes:
>>>
>>>> Bastien <address@hidden> writes:
>>>>
>>>>> as the subject says.  Please all test this heavily and report 
>>>>> any problems.  This will be part of Org 7.8 and soon in Emacs.
>>>>>
>>>>> Thanks a lot to Jambunathan for all this efforts, let's make
>>>>> sure everything is smooth before the release!
>>>>
>>>> I installed Org 7.8.02 by downloading the tarball, untarring it, running
>>>> make, then make install install-info.  When I run org-export-as-odt by
>>>> C-c C-e o, I get this message:
>>>>
>>>>        Cannot find factory styles file. Check package dir layout
>>>>
>>>> Setting debug-on-error, I get this traceback.
>>>
>>> Did the suggestions in the followup posts work for you? Could you please
>>> confirm.
>>
>> I haven't had time to check.  I worked around the problem for now by
>> installing the style files by hand.
>
> I tried again with a clean /usr/local/share/emacs/site-lisp.  I ran
> "make all" and "make install install-info", and then tried to export a
> file to ODT.  No change, same problem.
>
> I believe the problem is that the install target in the Makefile doesn't
> copy the style files to $(prefix)/share/emacs/etc/styles or
> $(prefix)/share/emacs/site-lisp/etc/styles as the code expects.

I modified the Makefile to do what I expected.  With this change, "make
install" copies the style files to $(prefix)/share/emacs/etc/styles, and
ODT export now works as expected.

Here's a unified diff:

--- Makefile~   2011-12-15 02:37:30.000000000 -0600
+++ Makefile    2011-12-15 11:02:57.054573287 -0600
@@ -19,6 +19,12 @@
 # Where local lisp files go.
 lispdir   = $(prefix)/share/emacs/site-lisp
 
+# Where etc files go.
+etcdir    = $(prefix)/share/emacs/etc
+
+# Where style files go
+stylesdir = $(etcdir)/styles
+
 # Where info files go.
 infodir = $(prefix)/share/info
 
@@ -175,6 +181,7 @@
 CARDFILES   = doc/orgcard.tex doc/orgcard.pdf doc/orgcard_letter.pdf
 TEXIFILES   = doc/org.texi
 INFOFILES   = doc/org
+STYLESFILES = etc/styles/OrgOdtContentTemplate.xml etc/styles/OrgOdtStyles.xml
 
 # Package Manager (ELPA)
 PKG_TAG = $(shell date +%Y%m%d)
@@ -211,7 +218,7 @@
 
 compile: $(ELCFILES0) $(ELCBFILES)
 
-install: install-lisp
+install: install-lisp install-etc
 
 doc: doc/org.html doc/org.pdf doc/orgcard.pdf doc/orgcard_letter.pdf 
doc/orgguide.pdf doc/orgcard.txt
 
@@ -231,6 +238,10 @@
        $(CP) $(INFOFILES) $(infodir)
        $(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES)
 
+install-etc: $(STYLESFILES)
+       if [ ! -d $(stylesdir) ]; then $(MKDIR) $(stylesdir); else true; fi ;
+       $(CP) $(STYLESFILES) $(stylesdir)
+
 autoloads: lisp/org-install.el
 
 lisp/org-install.el: $(LISPFILES0) Makefile