[Xfce4-commits] <xfce4-panel:devel> Use the plugindir from the library in the desktop files.

Nick Schermer nick at xfce.org
Tue Aug 11 20:32:36 CEST 2009 

Updating branch refs/heads/devel
         to 09ff76973bdf331d0e661c805e414e70773d7eb3 (commit)
       from e970036da46493376cff15ae1528e6add62388bb (commit)

commit 09ff76973bdf331d0e661c805e414e70773d7eb3
Author: Nick Schermer <nick at xfce.org>
Date:   Mon May 25 20:19:50 2009 +0200

    Use the plugindir from the library in the desktop files.

 plugins/actions/Makefile.am                   |    5 ++---
 plugins/actions/actions.desktop.in.in         |    2 +-
 plugins/clock/Makefile.am                     |    5 ++---
 plugins/clock/clock.desktop.in.in             |    2 +-
 plugins/launcher/Makefile.am                  |    5 ++---
 plugins/launcher/launcher.desktop.in.in       |    2 +-
 plugins/pager/Makefile.am                     |    5 ++---
 plugins/pager/pager.desktop.in.in             |    2 +-
 plugins/separator/Makefile.am                 |    5 ++---
 plugins/separator/separator.desktop.in.in     |    2 +-
 plugins/showdesktop/Makefile.am               |    5 ++---
 plugins/showdesktop/showdesktop.desktop.in.in |    2 +-
 plugins/systray/Makefile.am                   |    5 ++---
 plugins/systray/systray.desktop.in.in         |    2 +-
 plugins/tasklist/Makefile.am                  |    5 ++---
 plugins/tasklist/tasklist.desktop.in.in       |    2 +-
 plugins/windowmenu/Makefile.am                |    5 ++---
 plugins/windowmenu/windowmenu.desktop.in.in   |    2 +-
 18 files changed, 27 insertions(+), 36 deletions(-)

diff --git a/plugins/actions/Makefile.am b/plugins/actions/Makefile.am
index fb0d145..c6926bb 100644
--- a/plugins/actions/Makefile.am
+++ b/plugins/actions/Makefile.am
@@ -6,8 +6,7 @@ INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	libactions.la
@@ -52,7 +51,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = actions.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 actions.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/actions/actions.desktop.in.in b/plugins/actions/actions.desktop.in.in
index c229069..14d3c30 100644
--- a/plugins/actions/actions.desktop.in.in
+++ b/plugins/actions/actions.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Action Buttons
 _Comment=Log out, lock or other system actions
 Icon=system-log-out
 X-XFCE-Module=actions
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=TRUE
diff --git a/plugins/clock/Makefile.am b/plugins/clock/Makefile.am
index 67c1485..2287640 100644
--- a/plugins/clock/Makefile.am
+++ b/plugins/clock/Makefile.am
@@ -6,8 +6,7 @@ INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	libclock.la
@@ -62,7 +61,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files =	clock.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 clock.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/clock/clock.desktop.in.in b/plugins/clock/clock.desktop.in.in
index 7b8a528..3bd2d42 100644
--- a/plugins/clock/clock.desktop.in.in
+++ b/plugins/clock/clock.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Clock
 _Comment=What time is it?
 Icon=office-calendar
 X-XFCE-Module=clock
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=TRUE
diff --git a/plugins/launcher/Makefile.am b/plugins/launcher/Makefile.am
index b2de169..7a2e451 100644
--- a/plugins/launcher/Makefile.am
+++ b/plugins/launcher/Makefile.am
@@ -10,8 +10,7 @@ INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	liblauncher.la
@@ -62,7 +61,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = launcher.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 launcher.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/launcher/launcher.desktop.in.in b/plugins/launcher/launcher.desktop.in.in
index 3f53f44..12af281 100644
--- a/plugins/launcher/launcher.desktop.in.in
+++ b/plugins/launcher/launcher.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Launcher
 _Comment=Program launcher with optional menu
 Icon=application-x-executable
 X-XFCE-Module=launcher
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=TRUE
diff --git a/plugins/pager/Makefile.am b/plugins/pager/Makefile.am
index c1e39dc..a92b1ce 100644
--- a/plugins/pager/Makefile.am
+++ b/plugins/pager/Makefile.am
@@ -7,8 +7,7 @@ INCLUDES = \
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	libpager.la
@@ -55,7 +54,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = pager.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 pager.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/pager/pager.desktop.in.in b/plugins/pager/pager.desktop.in.in
index cc366aa..8527e55 100644
--- a/plugins/pager/pager.desktop.in.in
+++ b/plugins/pager/pager.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Pager
 _Comment=Miniature view of all virtual desktops
 Icon=xfce4-workspaces
 X-XFCE-Module=pager
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=TRUE
diff --git a/plugins/separator/Makefile.am b/plugins/separator/Makefile.am
index 84acee5..c3a8566 100644
--- a/plugins/separator/Makefile.am
+++ b/plugins/separator/Makefile.am
@@ -6,8 +6,7 @@ INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	libseparator.la
@@ -54,7 +53,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = separator.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 separator.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/separator/separator.desktop.in.in b/plugins/separator/separator.desktop.in.in
index ea41e48..8938237 100644
--- a/plugins/separator/separator.desktop.in.in
+++ b/plugins/separator/separator.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Separator
 _Comment=Adds a separator or space between panel items
 Icon=gtk-remove
 X-XFCE-Module=separator
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=TRUE
diff --git a/plugins/showdesktop/Makefile.am b/plugins/showdesktop/Makefile.am
index 74b3651..f08d3ef 100644
--- a/plugins/showdesktop/Makefile.am
+++ b/plugins/showdesktop/Makefile.am
@@ -8,8 +8,7 @@ INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	libshowdesktop.la
@@ -46,7 +45,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = showdesktop.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 showdesktop.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/showdesktop/showdesktop.desktop.in.in b/plugins/showdesktop/showdesktop.desktop.in.in
index d1f907a..ae178c1 100644
--- a/plugins/showdesktop/showdesktop.desktop.in.in
+++ b/plugins/showdesktop/showdesktop.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Show Desktop
 _Comment=Toggle button that hides all windows and shows the desktop
 Icon=user-desktop
 X-XFCE-Module=showdesktop
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=TRUE
diff --git a/plugins/systray/Makefile.am b/plugins/systray/Makefile.am
index 3d2eb60..6c4df99 100644
--- a/plugins/systray/Makefile.am
+++ b/plugins/systray/Makefile.am
@@ -6,8 +6,7 @@ INCLUDES = \
 	-DLOCALEDIR=\"$(localedir)\" \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	libsystray.la
@@ -62,7 +61,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = systray.desktop.in.in
 desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 systray.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/systray/systray.desktop.in.in b/plugins/systray/systray.desktop.in.in
index cc2c92b..673e6c0 100644
--- a/plugins/systray/systray.desktop.in.in
+++ b/plugins/systray/systray.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Notification Area
 _Comment=Area where notification icons appear
 Icon=applications-system
 X-XFCE-Module=systray
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=FALSE
diff --git a/plugins/tasklist/Makefile.am b/plugins/tasklist/Makefile.am
index 9da5925..c83685a 100644
--- a/plugins/tasklist/Makefile.am
+++ b/plugins/tasklist/Makefile.am
@@ -7,8 +7,7 @@ INCLUDES = \
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	libtasklist.la
@@ -56,7 +55,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = tasklist.desktop.in.in
 desktop_in_files =  $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 tasklist.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/tasklist/tasklist.desktop.in.in b/plugins/tasklist/tasklist.desktop.in.in
index 61b7fce..f2ce64c 100644
--- a/plugins/tasklist/tasklist.desktop.in.in
+++ b/plugins/tasklist/tasklist.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Task List
 _Comment=Show all running applications
 Icon=preferences-system-windows
 X-XFCE-Module=tasklist
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=TRUE
diff --git a/plugins/windowmenu/Makefile.am b/plugins/windowmenu/Makefile.am
index 8a7c081..257195e 100644
--- a/plugins/windowmenu/Makefile.am
+++ b/plugins/windowmenu/Makefile.am
@@ -7,8 +7,7 @@ INCLUDES = \
 	-DWNCK_I_KNOW_THIS_IS_UNSTABLE \
 	$(PLATFORM_CPPFLAGS)
 
-plugindir = \
-	$(libdir)/xfce4/panel-plugins
+plugindir = $(libdir)/xfce4/panel-plugins
 
 plugin_LTLIBRARIES = \
 	libwindowmenu.la
@@ -55,7 +54,7 @@ desktopdir = $(datadir)/xfce4/panel-plugins
 desktop_in_in_files = windowmenu.desktop.in.in
 desktop_in_files =  $(desktop_in_in_files:.desktop.in.in=.desktop.in)
 windowmenu.desktop.in: $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
+	sed -e "s,\@plugindir\@,$(plugindir),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/plugins/windowmenu/windowmenu.desktop.in.in b/plugins/windowmenu/windowmenu.desktop.in.in
index 3a5dd03..b28563b 100644
--- a/plugins/windowmenu/windowmenu.desktop.in.in
+++ b/plugins/windowmenu/windowmenu.desktop.in.in
@@ -5,5 +5,5 @@ _Name=Window Menu
 _Comment=Switch between open windows using a menu
 Icon=preferences-system-windows
 X-XFCE-Module=windowmenu
-X-XFCE-Module-Path=@libdir@/xfce4/panel-plugins
+X-XFCE-Module-Path=@plugindir@
 X-XFCE-Internal=TRUE

More information about the Xfce4-commits mailing list