From 891e7dc0f45c0fe8642826690d42c23027ca7713 Mon Sep 17 00:00:00 2001
From: Jambunathan K <kjambunathan@gmail.com>
Date: Mon, 14 Nov 2011 12:12:34 +0530
Subject: [PATCH] Makefile: ELPA updates for building org-odt

---
 Makefile | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index a8601a20c..df5632bbe 100644
--- a/Makefile
+++ b/Makefile
@@ -35,7 +35,8 @@ BATCH=$(EMACS) -batch -q -no-site-file -eval                             			\
 ELC= $(BATCH) -f batch-byte-compile
 
 # How to make a pdf file from a texinfo file
-TEXI2PDF = texi2pdf
+# TEXI2PDF = texi2pdf
+TEXI2PDF = texify --pdf
 
 # How to create directories
 MKDIR = mkdir -p
@@ -208,9 +209,9 @@ PKG_BNAME = org
 PKG_QNAME = $(PKG_BNAME)$(PKG_SEP)$(PKG_FLAVOUR)
 PKG_FNAME = $(PKG_QNAME)-$(PKG_TAG)
 
-PKG_DOC = "OpenDocumentText exporter for Orgmode"
+PKG_DOC = "OpenDocument Text exporter for Orgmode"
 # PKG_REQ = nil
-PKG_REQ = ((org \"20110928\"))
+PKG_REQ = ((org \"20111031\"))
 
 PKG_LISP_FILES = contrib/lisp/org-lparse.el     \
                  contrib/lisp/org-odt.el
@@ -219,15 +220,11 @@ ifndef PKG_LISP_FILES
 PKG_LISP_FILES = $(LISPFILES0)
 endif
 
-PKG_INFO_FILES = doc/org doc/dir
-# PKG_DOC_FILES =  doc/org.pdf             \
-#                  doc/org.html            \
-#                  doc/orgguide.pdf        \
-#                  doc/orgcard.txt         \
-#                  doc/orgcard.pdf         \
-#                  doc/orgcard_letter.pdf
+PKG_INFO_FILES = doc/org-odt doc/dir
+PKG_DOC_FILES =  doc/org-odt.pdf
 
-PKG_DATA_DIRS = contrib/odt
+PKG_DATA_SRC_DIRS = contrib/odt
+PKG_DATA_DST_DIRS = 
 PKG_README_ORG_FILE = contrib/odt/README.org
 PKG_README_HTML_FILE = $(PKG_README_ORG_FILE:.org=.html)
 
@@ -454,7 +451,7 @@ distfile:
 pkg:
 	@if [ "X$(PKG_TAG)" = "X" ]; then echo "*** No tag ***"; exit 1; fi
 	echo "Building $(PKG_FNAME).tar ..."
-	touch doc/org.texi doc/orgcard.tex # force update
+	touch doc/org-odt.texi doc/orgcard.tex # force update
 	rm -rf $(PKG_FNAME) $(PKG_FNAME).tar
 	$(MKDIR) $(PKG_FNAME)
 	cp -r $(PKG_LISP_FILES) $(PKG_FNAME)
@@ -466,15 +463,21 @@ pkg:
 	tar cf $(PKG_FNAME).tar $(PKG_FNAME) --remove-files
 	${MAKE} pkg-upload
 
-pkg-data: $(PKG_DATA_DIRS)
-	@if [ "X$(PKG_DATA_DIRS)" = "X" ];			\
-	then echo "*** WARNING: PKG_DATA_DIRS not defined ***";	\
-	else 							\
-	git clean -dfx $<;					\
-	mkdir -p $(PKG_FNAME)/$<;				\
-	cp -r $</* $(PKG_FNAME)/$<;				\
+pkg-data: $(PKG_DATA_SRC_DIRS)
+	@if [ "X$(PKG_DATA_SRC_DIRS)" = "X" ];				\
+	then echo "*** WARNING: PKG_DATA_SRC_DIRS not defined ***";	\
+	else 								\
+	git clean -dfx $<;						\
+	mkdir -p $(PKG_FNAME)/$(PKG_DATA_DST_DIRS);			\
+	cp -r $</* $(PKG_FNAME)/$(PKG_DATA_DST_DIRS);			\
 	fi
 
+doc/org-odt: doc/org-odt.texi
+	(cd doc && $(MAKEINFO) --no-split org-odt.texi -o org-odt)
+
+doc/org-odt.pdf: doc/org-odt.texi
+	(cd doc && $(TEXI2PDF) org-odt.texi)
+
 pkg-info: $(PKG_INFO_FILES)
 	cp -r $(PKG_INFO_FILES) $(PKG_FNAME)
 
-- 
2.11.4.GIT