From 3b584566735a5260b68e5c6b050a71f40957385c Mon Sep 17 00:00:00 2001
From: fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>
Date: Tue, 23 Sep 2008 15:55:30 +0000
Subject: [PATCH] Moved odt-styles/ to data/.  Removed unneeded variable in
 Makefile.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1458 788f1e2b-df1e-0410-8736-df70ead52e1b
---
 Makefile                                            |   1 -
 Text/Pandoc/ODT.hs                                  |   2 +-
 .../odt-styles}/META-INF/manifest.xml               |   0
 .../odt-styles}/Thumbnails/thumbnail.png            | Bin
 {odt-styles => data/odt-styles}/meta.xml            |   0
 {odt-styles => data/odt-styles}/mimetype            |   0
 {odt-styles => data/odt-styles}/settings.xml        |   0
 {odt-styles => data/odt-styles}/styles.xml          |   0
 8 files changed, 1 insertion(+), 2 deletions(-)
 rename {odt-styles => data/odt-styles}/META-INF/manifest.xml (100%)
 rename {odt-styles => data/odt-styles}/Thumbnails/thumbnail.png (100%)
 rename {odt-styles => data/odt-styles}/meta.xml (100%)
 rename {odt-styles => data/odt-styles}/mimetype (100%)
 rename {odt-styles => data/odt-styles}/settings.xml (100%)
 rename {odt-styles => data/odt-styles}/styles.xml (100%)

diff --git a/Makefile b/Makefile
index 7ee6ef40d..b728cacf4 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,6 @@ BUILDDIR  := dist
 BUILDCONF := $(BUILDDIR)/setup-config
 BUILDVARS := vars
 CONFIGURE := configure
-ODTSTYLES := odt-styles
 
 #-------------------------------------------------------------------------------
 # Cabal constants
diff --git a/Text/Pandoc/ODT.hs b/Text/Pandoc/ODT.hs
index 10cf1b7e2..f9e4dd8f1 100644
--- a/Text/Pandoc/ODT.hs
+++ b/Text/Pandoc/ODT.hs
@@ -46,7 +46,7 @@ saveOpenDocumentAsODT :: FilePath    -- ^ Pathname of ODT file to be produced.
                       -> String      -- ^ OpenDocument XML contents.
                       -> IO ()
 saveOpenDocumentAsODT destinationODTPath sourceDirRelative xml = do
-  let refArchive = read $(makeZip "odt-styles")
+  let refArchive = read $(makeZip $ "data" </> "odt-styles")
   -- handle pictures
   let (newContents, pics) = 
         case runParser pPictures [] "OpenDocument XML contents" xml of
diff --git a/odt-styles/META-INF/manifest.xml b/data/odt-styles/META-INF/manifest.xml
similarity index 100%
rename from odt-styles/META-INF/manifest.xml
rename to data/odt-styles/META-INF/manifest.xml
diff --git a/odt-styles/Thumbnails/thumbnail.png b/data/odt-styles/Thumbnails/thumbnail.png
similarity index 100%
rename from odt-styles/Thumbnails/thumbnail.png
rename to data/odt-styles/Thumbnails/thumbnail.png
diff --git a/odt-styles/meta.xml b/data/odt-styles/meta.xml
similarity index 100%
rename from odt-styles/meta.xml
rename to data/odt-styles/meta.xml
diff --git a/odt-styles/mimetype b/data/odt-styles/mimetype
similarity index 100%
rename from odt-styles/mimetype
rename to data/odt-styles/mimetype
diff --git a/odt-styles/settings.xml b/data/odt-styles/settings.xml
similarity index 100%
rename from odt-styles/settings.xml
rename to data/odt-styles/settings.xml
diff --git a/odt-styles/styles.xml b/data/odt-styles/styles.xml
similarity index 100%
rename from odt-styles/styles.xml
rename to data/odt-styles/styles.xml