[O] ORG_ADD_CONTRIB and org-e-odt.el don't always play well together

[Nick Dokos]

I added the following to my local.mk

ORG_ADD_CONTRIB = org-e-*

so when I do "make autoloads" (running from the git directory and
without compiling), it copies (among others) contrib/lisp/org-e-odt.el
to lisp/:

,----
| $ make autoloads
| make -C lisp autoloads
| make[1]: Entering directory `/home/nick/src/emacs/org/org-mode/lisp'
| rm -f org-version.el org-loaddefs.el org-version.elc org-loaddefs.elc
| install -m 644 -p ../contrib/lisp/org-e-ascii.el 
../contrib/lisp/org-e-beamer.el ../contrib/lisp/org-e-groff.el\
|                   ../contrib/lisp/org-e-html.el 
../contrib/lisp/org-e-latex.el ../contrib/lisp/org-e-man.el\
|                   ../contrib/lisp/org-e-odt.el 
../contrib/lisp/org-e-publish.el ../contrib/lisp/org-e-texinfo.el .
| org-version: 7.9.2 (release_7.9.2-382-g1ef9ee)
`----

When I then try to org-reload, I get an error because
org-e-odt.el restricts the path of the style file to one of three
choices (../../etc/styles, ../../etc/org, ../etc/org) relative to where
org-e-odt.el is found. None of these is satisfactory in this context: it
would have to be ../etc/styles.

Nick