Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge pull request #7 from danc86/master

Build cleanups for Xfce
  • Loading branch information...
commit dbe208f46e8e991d273e123d50bb46d4d98914d9 2 parents e6c1d0d + 4d521eb
Alexander Kojevnikov authored
11 Makefile.am
... ... @@ -1,4 +1,5 @@
1   -libexec_PROGRAMS = xmonad-log-applet
  1 +plugindir = $(PLUGIN_DIR)
  2 +plugin_PROGRAMS = xmonad-log-applet
2 3
3 4 xmonad_log_applet_SOURCES = main.c
4 5
@@ -16,20 +17,20 @@ appletdir = $(LIBPANEL_APPLET_DIR)
16 17 if PANEL_XFCE4
17 18 applet_files = xmonad-log-applet.desktop
18 19 $(applet_files): $(applet_files:.desktop=.desktop.in)
19   - $(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
  20 + $(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
20 21 else
21 22 applet_files = org.gnome.panel.XmonadLogApplet.panel-applet
22 23 $(applet_files): $(applet_files:.panel-applet=.panel-applet.in)
23   - $(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
  24 + $(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
24 25 endif
25 26 applet_DATA = $(applet_files)
26 27
  28 +if !PANEL_XFCE4
27 29 servicedir = $(SESSION_BUS_SERVICES_DIR)
28 30 service_in_files = org.gnome.panel.applet.XmonadLogAppletFactory.service.in
29   -if !PANEL_XFCE4
30 31 service_DATA = $(service_in_files:.service.in=.service)
31 32 org.gnome.panel.applet.XmonadLogAppletFactory.service: $(service_in_files)
32   - $(SED) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
  33 + $(SED) -e "s|\@PLUGIN_DIR\@|$(PLUGIN_DIR)|" $< > $@
33 34 endif
34 35
35 36 DISTCLEANFILES = \
4 configure.ac
@@ -28,21 +28,25 @@ AS_IF(
28 28 [test "x$panel" = xgnome2],
29 29 [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)]
30 30 LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets
  31 + PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec
31 32 [AC_DEFINE(PANEL_GNOME2, 1, [panel version])]
32 33 ,
33 34 [test "x$panel" = xgnome3],
34 35 [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)]
35 36 LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
  37 + PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec
36 38 [AC_DEFINE(PANEL_GNOME3, 1, [panel version])]
37 39 ,
38 40 [test "x$panel" = xxfce4],
39 41 [PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)]
40 42 LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins
  43 + PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins
41 44 [AC_DEFINE(PANEL_XFCE4, 1, [panel version])]
42 45 ,
43 46 [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3 or xfce4])]
44 47 )
45 48 AC_SUBST([LIBPANEL_APPLET_DIR])
  49 +AC_SUBST([PLUGIN_DIR])
46 50
47 51 AM_CONDITIONAL([PANEL_GNOME2], [test "x$panel" = xgnome2])
48 52 AM_CONDITIONAL([PANEL_GNOME3], [test "x$panel" = xgnome3])
2  org.gnome.panel.XmonadLogApplet.panel-applet.in
... ... @@ -1,6 +1,6 @@
1 1 [Applet Factory]
2 2 Id=XmonadLogAppletFactory
3   -Location=@LIBEXECDIR@/xmonad-log-applet
  3 +Location=@PLUGIN_DIR@/xmonad-log-applet
4 4 Name=Xmonad Log Factory
5 5 Description=Factory for the xmonad-log-applet
6 6
2  org.gnome.panel.applet.XmonadLogAppletFactory.service.in
... ... @@ -1,3 +1,3 @@
1 1 [D-BUS Service]
2 2 Name=org.gnome.panel.applet.XmonadLogAppletFactory
3   -Exec=@LIBEXECDIR@/xmonad-log-applet
  3 +Exec=@PLUGIN_DIR@/xmonad-log-applet
2  xmonad-log-applet.desktop.in
@@ -3,6 +3,6 @@ Type=X-XFCE-PanelPlugin
3 3 Name=Xmonad Log Applet
4 4 Comment=Monitor your Xmonad log
5 5 Icon=xmonad-log-applet
6   -X-XFCE-Exec=@LIBEXECDIR@/xmonad-log-applet
  6 +X-XFCE-Exec=@PLUGIN_DIR@/xmonad-log-applet
7 7 X-XFCE-Unique=false
8 8 X-XFCE-Internal=false

0 comments on commit dbe208f

Please sign in to comment.
Something went wrong with that request. Please try again.