summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Marquardt <davemarq@us.ibm.com>2011-12-21 00:16:05 +0100
committerBastien Guerry <bzg@altern.org>2011-12-21 00:16:05 +0100
commite514982ae126c058b965dd00393b4e68e5f8522d (patch)
tree34c7741996b1f075014fbd267f08b3b71b5f2c13
parentbcfe9cd5d03dee6cb4c9ac0f0b1c1b6a58b9be14 (diff)
downloadorg-mode-e514982ae126c058b965dd00393b4e68e5f8522d.tar.gz
Fix Makefile: install the etc/ directory and styles files correctly.
-rw-r--r--Makefile17
1 files changed, 14 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 25a9b7f..eb0a3d1 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,16 @@ EMACS=emacs
# Where local software is found
prefix=/usr/local
-# Where local lisp files go.
+# Where local lisp files go
lispdir = $(prefix)/share/emacs/site-lisp
-# Where info files go.
+# Where etc files go
+etcdir = $(lispdir)/../etc
+
+# Where style files go
+stylesdir = $(etcdir)/styles
+
+# Where info files go
infodir = $(prefix)/share/info
##----------------------------------------------------------------------
@@ -175,6 +181,7 @@ DOCFILES = doc/org.texi doc/org.pdf doc/org doc/dir \
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 @@ update:
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 @@ install-info: $(INFOFILES)
$(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