From 1158e77e135227723cb8de9a5bc06905abbfcb96 Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 23 Jun 2013 23:24:02 +0000 Subject: [PATCH] Correctly set images/webstuff path in htmldoc.py and setup.py svn: r22578 --- gramps/plugins/docgen/htmldoc.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gramps/plugins/docgen/htmldoc.py b/gramps/plugins/docgen/htmldoc.py index 4371c52ae..a2a460ef2 100644 --- a/gramps/plugins/docgen/htmldoc.py +++ b/gramps/plugins/docgen/htmldoc.py @@ -298,7 +298,7 @@ class HtmlDoc(BaseDoc, TextDoc): if os.path.exists(fullpath): self.copy_file(fullpath, _HTMLSCREEN) #favicon - self.copy_file(os.path.join(IMAGE_DIR, 'favicon.ico'), + self.copy_file(os.path.join(IMAGE_DIR, 'webstuff', 'favicon.ico'), 'favicon.ico') def __reduce_list(self): diff --git a/setup.py b/setup.py index 1d1802dc8..ca08f5cb1 100644 --- a/setup.py +++ b/setup.py @@ -390,7 +390,7 @@ SWANKY_IMG = glob.glob(os.path.join('data', 'css', 'swanky-purse', 'images', '*. data_files_core.append(('share/doc/gramps', DOC_FILES)) data_files_core.append(('share/doc/gramps/example/gedcom', GEDCOM_FILES)) data_files_core.append(('share/doc/gramps/example/gramps', GRAMPS_FILES)) -data_files_core.append(('share/gramps/images', IMAGE_WEB)) +data_files_core.append(('share/gramps/images/webstuff', IMAGE_WEB)) data_files_core.append(('share/gramps/css', CSS_FILES)) data_files_core.append(('share/gramps/css/swanky-purse', SWANKY_PURSE)) data_files_core.append(('share/gramps/css/swanky-purse/images', SWANKY_IMG))