From 7df3f329eebf4da1a8d5d0ce6f08508fe9babea2 Mon Sep 17 00:00:00 2001 From: Sanel Zukan Date: Fri, 20 Feb 2009 16:27:25 +0000 Subject: [PATCH] Changed path for splash themes Small Jamfile(s) refactoring --- evoke/Splash.cpp | 2 +- evoke/splash-themes/scape/Jamfile | 5 ++--- evoke/splash-themes/standard/Jamfile | 5 ++--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/evoke/Splash.cpp b/evoke/Splash.cpp index 1c03767..aaabf32 100644 --- a/evoke/Splash.cpp +++ b/evoke/Splash.cpp @@ -120,7 +120,7 @@ void Splash::run(void) { #ifdef USE_LOCAL_CONFIG splash_theme_path = "splash-themes/"; #else - splash_theme_path = Resource::find_data("ede/splash-themes", RES_SYS_ONLY); + splash_theme_path = Resource::find_data("themes/splash-themes", RES_SYS_ONLY); if(splash_theme_path.empty()) { E_WARNING(E_STRLOC ": Unable to locate splash themes in $XDG_DATA_DIRS directories\n"); return; diff --git a/evoke/splash-themes/scape/Jamfile b/evoke/splash-themes/scape/Jamfile index 0d98c7e..812edb5 100644 --- a/evoke/splash-themes/scape/Jamfile +++ b/evoke/splash-themes/scape/Jamfile @@ -10,6 +10,5 @@ SubDir TOP evoke splash-themes scape ; -DATA = background.png edewm.png ede-desktop.png emountd.png ede-panel.png xscreensaver.png ; - -InstallData $(datarootdir)/splash-themes/scape : $(DATA) ; +DATA = [ Wildcard *.png ] ; +InstallData [ FDirName $(EDE_THEMES_DIR) splash-themes scape ] : $(DATA) ; diff --git a/evoke/splash-themes/standard/Jamfile b/evoke/splash-themes/standard/Jamfile index 1cfbc24..58adb27 100644 --- a/evoke/splash-themes/standard/Jamfile +++ b/evoke/splash-themes/standard/Jamfile @@ -10,6 +10,5 @@ SubDir TOP evoke splash-themes standard ; -DATA = background.png edewm.png ede-desktop.png emountd.png ede-panel.png xscreensaver.png ; - -InstallData $(datarootdir)/splash-themes/standard : $(DATA) ; +DATA = [ Wildcard *.png ] ; +InstallData [ FDirName $(EDE_THEMES_DIR) splash-themes standard ] : $(DATA) ;