[chronojump] Deploy chronojump.png and report_web_style.css

[Andoni Morales Alastruey <amorales src gnome org>]

commit 8abc90aca12707f8728bd88a7255c45a9a422b46
Author: Andoni Morales Alastruey <ylatuya gmail com>
Date:   Mon Aug 17 08:07:21 2009 +0200

    Deploy chronojump.png and report_web_style.css

 Makefile.include |    4 +++-
 src/Makefile.am  |   10 +++++++---
 src/report.cs    |    4 ++--
 src/util.cs      |    9 +++++++++
 4 files changed, 21 insertions(+), 6 deletions(-)
---
diff --git a/Makefile.include b/Makefile.include
index 6669864..9e0a710 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -69,7 +69,9 @@ linuxdesktopapplicationsdir = @datadir@/applications
 linuxdesktopapplications_DATA = $(LINUX_DESKTOPAPPLICATIONS)
 programfilesdir = @libdir@/@PACKAGE@
 programfiles_DATA = $(PROGRAMFILES)
-commonapplicationdatarootimagesdir = @datadir@/images
+commonapplicationdatarootdir = @datadir@/@PACKAGE@/
+commonapplicationdataroot_DATA = $(COMMONAPPLICATIONDATA_ROOT)
+commonapplicationdatarootimagesdir = @datadir@/@PACKAGE@/images
 commonapplicationdatarootimages_DATA = $(COMMONAPPLICATIONDATAROOT_IMAGES)
 commonapplicationdatarootlogodir = @datadir@/icons/hicolor/48x48/apps/
 commonapplicationdatarootlogo_DATA = $(COMMONAPPLICATIONDATAROOT_LOGO)
diff --git a/src/Makefile.am b/src/Makefile.am
index 56f4fcc..6d11fb6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -27,7 +27,11 @@ endif
 AL=al2
 SATELLITE_ASSEMBLY_NAME=$(notdir $(basename $(ASSEMBLY))).resources.dll
 
-COMMONAPPLICATIONDATAROOT_IMAGES = 
+COMMONAPPLICATIONDATAROOT_IMAGES = \
+	../images/chronojump_logo.png
+
+COMMONAPPLICATIONDATA_ROOT = \
+	../images/report_web_style.css
  
 
 PROGRAMFILES = \
@@ -54,7 +58,7 @@ BINARIES = \
 
 RESGEN=resgen2
 	
-all: $(ASSEMBLY) $(COMMONAPPLICATIONDATAROOT_IMAGES) $(COMMONAPPLICATIONDATAROOT_LOGO) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES) 
+all: $(ASSEMBLY) $(COMMONAPPLICATIONDATA_ROOT) $(COMMONAPPLICATIONDATAROOT_IMAGES) $(COMMONAPPLICATIONDATAROOT_LOGO) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES) 
 
 FILES = \
 	gui/chronojump.cs\
@@ -312,7 +316,7 @@ DLL_REFERENCES =  \
 	../build/data/linux_dlls/NPlot.Gtk.dll
 
 
-CLEANFILES = $(COMMONAPPLICATIONDATAROOT_IMAGES) $(COMMONAPPLICATIONDATAROOT_LOGO) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES) 
+CLEANFILES = $(COMMONAPPLICATIONDATA_ROOT) $(COMMONAPPLICATIONDATAROOT_IMAGES) $(COMMONAPPLICATIONDATAROOT_LOGO) $(PROGRAMFILES) $(LINUX_DESKTOPAPPLICATIONS) $(BINARIES) 
 
 
 include $(top_srcdir)/Makefile.include
diff --git a/src/report.cs b/src/report.cs
index 6ea3ffd..920d61d 100644
--- a/src/report.cs
+++ b/src/report.cs
@@ -196,12 +196,12 @@ public class Report : ExportSession
 	void copyCssAndLogo() {
 		//copy files, and continue if already exists
 		try {
-			File.Copy(Constants.FileNameCSS, 
+			File.Copy(Util.GetCssDir()+ Path.DirectorySeparatorChar + Constants.FileNameCSS, 
 					Util.GetReportDirectoryName(fileName) + Path.DirectorySeparatorChar + Constants.FileNameCSS );
 		} catch {}
 		try {
 
-			File.Copy(Constants.FileNameLogo, 
+			File.Copy(Util.GetImagesDir() + Path.DirectorySeparatorChar + Constants.FileNameLogo, 
 					Util.GetReportDirectoryName(fileName) + Path.DirectorySeparatorChar + Constants.FileNameLogo );
 		} catch {}
 	}
diff --git a/src/util.cs b/src/util.cs
index 5517d1b..c0e984b 100644
--- a/src/util.cs
+++ b/src/util.cs
@@ -694,8 +694,17 @@ public class Util
 			return System.IO.Path.Combine(runningFolder,"../../");
 	}
 
+	public static string GetDataDir(){
+		return System.IO.Path.Combine(GetPrefixDir(),"share");
+	}
 
+	public static string GetImagesDir(){
+		return System.IO.Path.Combine(GetDataDir(),"chronojump/images");
+	}
 
+	public static string GetCssDir(){
+		return GetDataDir();
+	}
 	
 	public static void BackupDirCreateIfNeeded () {
 		string backupDir = GetDatabaseDir() + Path.DirectorySeparatorChar + "backup";