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
2008-09-23 15:55:30 +00:00 · 2008-09-23 15:55:30 +00:00 · 3b58456673
commit 3b58456673
parent fcb220a7a4
8 changed files with 1 additions and 2 deletions
--- a/1
+++ b/1
@ -11,7 +11,6 @@ BUILDDIR  := dist
 BUILDCONF := $(BUILDDIR)/setup-config
 BUILDVARS := vars
 CONFIGURE := configure
-ODTSTYLES := odt-styles

 #-------------------------------------------------------------------------------
 # Cabal constants
--- 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
--- a/data/odt-styles/META-INF/manifest.xml
+++ b/data/odt-styles/META-INF/manifest.xml
--- a/data/odt-styles/Thumbnails/thumbnail.png
+++ b/data/odt-styles/Thumbnails/thumbnail.png
--- a/data/odt-styles/meta.xml
+++ b/data/odt-styles/meta.xml
--- a/data/odt-styles/mimetype
+++ b/data/odt-styles/mimetype
--- a/data/odt-styles/settings.xml
+++ b/data/odt-styles/settings.xml
--- a/data/odt-styles/styles.xml
+++ b/data/odt-styles/styles.xml