From 7e71f8648eaa6da7b59debe594e525c8d573e75f Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 30 Jul 2008 16:54:10 -0700 Subject: [PATCH] IGN:... --- installer/windows/freeze.py | 3 ++- src/calibre/utils/PythonMagickWand.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/installer/windows/freeze.py b/installer/windows/freeze.py index 4474776dc3..8d7f53228e 100644 --- a/installer/windows/freeze.py +++ b/installer/windows/freeze.py @@ -110,7 +110,8 @@ class BuildEXE(py2exe.build_exe.py2exe): print '\tAdding pdftohtml' shutil.copyfile(PDFTOHTML, os.path.join(PY2EXE_DIR, os.path.basename(PDFTOHTML))) print '\tAdding ImageMagick' - shutil.copytree(IMAGEMAGICK_DIR, os.path.join(PY2EXE_DIR, 'ImageMagick')) + for f in os.listdir(IMAGEMAGICK_DIR): + shutil.copyfile(os.path.join(IMAGEMAGICK_DIR, f), os.path.join(PY2EXE_DIR, f)) print '\tCopying fontconfig' for f in glob.glob(os.path.join(FONTCONFIG_DIR, '*')): tgt = os.path.join(PY2EXE_DIR, os.path.basename(f)) diff --git a/src/calibre/utils/PythonMagickWand.py b/src/calibre/utils/PythonMagickWand.py index cdb3337e24..e3e421fe55 100644 --- a/src/calibre/utils/PythonMagickWand.py +++ b/src/calibre/utils/PythonMagickWand.py @@ -76,7 +76,7 @@ if isosx: _lib = os.path.join(getattr(sys, 'frameworks_dir'), 'ImageMagick', 'libMagickWand.dylib') \ if isfrozen else util.find_library('Wand') elif iswindows: - _lib = os.path.join(os.path.dirname(sys.executable), 'ImageMagick', 'CORE_RL_wand_.dll') \ + _lib = os.path.join(os.path.dirname(sys.executable), 'CORE_RL_wand_.dll') \ if isfrozen else 'CORE_RL_wand_' else: _lib = util.find_library('MagickWand')