[Xfce4-commits] <xfce4-session:master> Move splash engines to $lidir/xfce4/session/splash-engines.

[Nick Schermer]

Updating branch refs/heads/master
         to 92a18cb13ba74a4ca8304a4a37a4af4a3afeef0a (commit)
       from 29458948356bd057887a32c52a9e7e416400a034 (commit)

commit 92a18cb13ba74a4ca8304a4a37a4af4a3afeef0a
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Aug 26 20:36:53 2010 +0200

    Move splash engines to $lidir/xfce4/session/splash-engines.
    
    Now we have all the session library data in $lidir/xfce4/session,
    which is a lot nicer. I doubt there are custom engines out there,
    so I guess it's a safe move.

 engines/balou/Makefile.am  |    2 +-
 engines/mice/Makefile.am   |    2 +-
 engines/simple/Makefile.am |    2 +-
 settings/Makefile.am       |    2 +-
 xfce4-session.spec.in      |    6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engines/balou/Makefile.am b/engines/balou/Makefile.am
index 902ef4d..6b98998 100644
--- a/engines/balou/Makefile.am
+++ b/engines/balou/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS =								\
 	scripts								\
 	themes
 
-baloudir = $(libdir)/xfce4/splash/engines
+baloudir = $(libdir)/xfce4/session/splash-engines
 
 balou_LTLIBRARIES = libbalou.la
 
diff --git a/engines/mice/Makefile.am b/engines/mice/Makefile.am
index 9363ddb..9fe4a2f 100644
--- a/engines/mice/Makefile.am
+++ b/engines/mice/Makefile.am
@@ -1,4 +1,4 @@
-micedir = $(libdir)/xfce4/splash/engines
+micedir = $(libdir)/xfce4/session/splash-engines
 
 mice_LTLIBRARIES = libmice.la
 
diff --git a/engines/simple/Makefile.am b/engines/simple/Makefile.am
index ca5d0f5..bdc8f48 100644
--- a/engines/simple/Makefile.am
+++ b/engines/simple/Makefile.am
@@ -1,4 +1,4 @@
-simpledir = $(libdir)/xfce4/splash/engines
+simpledir = $(libdir)/xfce4/session/splash-engines
 
 simple_LTLIBRARIES = libsimple.la
 
diff --git a/settings/Makefile.am b/settings/Makefile.am
index ecf6eed..eb92b8d 100644
--- a/settings/Makefile.am
+++ b/settings/Makefile.am
@@ -23,7 +23,7 @@ xfce4_session_settings_SOURCES = \
 
 xfce4_session_settings_CFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DMODULESDIR=\"$(libdir)/xfce4/splash/engines\" \
+	-DMODULESDIR=\"$(libdir)/xfce4/session/splash-engines\" \
 	-DG_LOG_DOMAIN=\"xfce4-session-settings\" \
 	-I$(top_srcdir) \
 	$(LIBXFCE4UTIL_CFLAGS) \
diff --git a/xfce4-session.spec.in b/xfce4-session.spec.in
index d925ed8..96bd15c 100644
--- a/xfce4-session.spec.in
+++ b/xfce4-session.spec.in
@@ -64,7 +64,7 @@ fi
 %{_datadir}/xfce4/*
 %{_datadir}/locale/*
 %{_libdir}/lib*.so.*
-%{_libdir}/xfce4/splash/engines/libmice.*
+%{_libdir}/xfce4/session/splash-engines/libmice.*
 %{_libdir}/xfce4/session/xfsm-shutdown-helper
 %{_mandir}/man1/*
 %{_sysconfdir}/xdg/*
@@ -79,6 +79,6 @@ fi
 %files engines
 %defattr(-,root,root)
 %{_datadir}/themes/Default/balou/*
-%{_libdir}/xfce4/splash/engines/libbalou.*
-%{_libdir}/xfce4/splash/engines/libsimple.*
+%{_libdir}/xfce4/session/splash-engines/libbalou.*
+%{_libdir}/xfce4/session/splash-engines/libsimple.*
 %{_libdir}/xfce4/session/balou-*