mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
51 lines
2.3 KiB
Diff
51 lines
2.3 KiB
Diff
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
index 619012d..dcc6d3c 100644
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -1,4 +1,5 @@
|
||
|
|
plugindir = $(PLUGIN_DIR)
|
||
|
|
+SESSION_BUS_SERVICES_DIR = $(prefix)/share/dbus-1/services
|
||
|
|
plugin_PROGRAMS = xmonad-log-applet
|
||
|
|
|
||
|
|
xmonad_log_applet_SOURCES = main.c
|
||
|
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index ad4cffb..110c953 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -27,28 +27,28 @@ AC_ARG_WITH(
|
||
|
|
AS_IF(
|
||
|
|
[test "x$panel" = xgnome2],
|
||
|
|
[PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)]
|
||
|
|
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets
|
||
|
|
- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec
|
||
|
|
+ LIBPANEL_APPLET_DIR=${prefix}/share/gnome-panel/applets
|
||
|
|
+ PLUGIN_DIR=${prefix}/libexec
|
||
|
|
[AC_DEFINE(PANEL_GNOME, 1, [panel type])]
|
||
|
|
[AC_DEFINE(PANEL_GNOME2, 1, [panel type])]
|
||
|
|
,
|
||
|
|
[test "x$panel" = xgnome3],
|
||
|
|
[PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)]
|
||
|
|
LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
|
||
|
|
- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec
|
||
|
|
+ PLUGIN_DIR=${prefix}/libexec
|
||
|
|
[AC_DEFINE(PANEL_GNOME, 1, [panel type])]
|
||
|
|
[AC_DEFINE(PANEL_GNOME3, 1, [panel type])]
|
||
|
|
,
|
||
|
|
[test "x$panel" = xmate],
|
||
|
|
[PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-3.0 >= 1.4.0)]
|
||
|
|
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/share/mate-panel/applets
|
||
|
|
- PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-3.0`/libexec
|
||
|
|
+ LIBPANEL_APPLET_DIR=${prefix}/share/mate-panel/applets
|
||
|
|
+ PLUGIN_DIR=${prefix}/libexec
|
||
|
|
[AC_DEFINE(PANEL_MATE, 1, [panel type])]
|
||
|
|
,
|
||
|
|
[test "x$panel" = xxfce4],
|
||
|
|
[PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)]
|
||
|
|
- LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins
|
||
|
|
- PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins
|
||
|
|
+ LIBPANEL_APPLET_DIR=${prefix}/share/xfce4/panel-plugins
|
||
|
|
+ PLUGIN_DIR=${prefix}/lib/xfce4/panel/plugins
|
||
|
|
[AC_DEFINE(PANEL_XFCE4, 1, [panel type])]
|
||
|
|
,
|
||
|
|
[AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, mate or xfce4])]
|