Browse Source

Fix Makefile: install the etc/ directory and styles files correctly.

Dave Marquardt 9 years ago
parent
commit
e514982ae1
1 changed files with 14 additions and 3 deletions
  1. 14 3
      Makefile

+ 14 - 3
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