pkgs/applications/window-managers/xmonad/log-applet/fix-paths.patch

   1 --- a/configure.ac
   2 +++ b/configure.ac
   3 @@ -20,7 +20,7 @@
   4  PKG_CHECK_MODULES(XCB, xcb xcb-ewmh)
   5
   6  PKG_CHECK_MODULES(DBUS_GLIB, dbus-glib-1 >= 0.80)
   7 -SESSION_BUS_SERVICES_DIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
   8 +SESSION_BUS_SERVICES_DIR=$prefix/share/dbus-1/services
   9  AC_SUBST([SESSION_BUS_SERVICES_DIR])
  10
  11  AC_ARG_WITH(
  12 @@ -32,35 +32,35 @@
  13  AS_IF(
  14      [test "x$panel" = xgnome2],
  15          [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-3.0 >= 2.32.0)]
  16 -        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/share/gnome-panel/applets
  17 -        PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-3.0`/libexec
  18 +        LIBPANEL_APPLET_DIR=$prefix/share/gnome-panel/applets
  19 +        PLUGIN_DIR=$prefix/libexec
  20          [AC_DEFINE(PANEL_GNOME, 1, [panel type])]
  21          [AC_DEFINE(PANEL_GNOME2, 1, [panel type])]
  22          ,
  23      [test "x$panel" = xgnome3],
  24          [PKG_CHECK_MODULES(LIBPANEL, libpanelapplet-4.0 >= 3.0.0)]
  25 -        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
  26 -        PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanelapplet-4.0`/libexec
  27 +        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanelapplet-4.0`
  28 +        PLUGIN_DIR=$prefix/libexec
  29          [AC_DEFINE(PANEL_GNOME, 1, [panel type])]
  30          [AC_DEFINE(PANEL_GNOME3, 1, [panel type])]
  31          ,
  32      [test "x$panel" = xgnomeflashback],
  33          [PKG_CHECK_MODULES(LIBPANEL, libpanel-applet >= 3.0.0)]
  34 -        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet`
  35 -        PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libpanel-applet`/libexec
  36 +        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libpanel_applet_dir libpanel-applet`
  37 +        PLUGIN_DIR=$prefix/libexec
  38          [AC_DEFINE(PANEL_GNOME, 1, [panel type])]
  39          [AC_DEFINE(PANEL_GNOMEFLASHBACK, 1, [panel type])]
  40          ,
  41      [test "x$panel" = xmate],
  42          [PKG_CHECK_MODULES(LIBPANEL, libmatepanelapplet-4.0 >= 1.4.0)]
  43 -        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/share/mate-panel/applets
  44 -        PLUGIN_DIR=`$PKG_CONFIG --variable=prefix libmatepanelapplet-4.0`/libexec
  45 +        LIBPANEL_APPLET_DIR=$prefix/share/mate-panel/applets
  46 +        PLUGIN_DIR=$prefix/libexec
  47          [AC_DEFINE(PANEL_MATE, 1, [panel type])]
  48          ,
  49      [test "x$panel" = xxfce4],
  50          [PKG_CHECK_MODULES(LIBPANEL, libxfce4panel-1.0 >= 4.6.0)]
  51 -        LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=prefix libxfce4panel-1.0`/share/xfce4/panel-plugins
  52 -        PLUGIN_DIR=`$PKG_CONFIG --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins
  53 +        LIBPANEL_APPLET_DIR=$prefix/share/xfce4/panel-plugins
  54 +        PLUGIN_DIR=`$PKG_CONFIG --define-variable=prefix=$prefix --variable=libdir libxfce4panel-1.0`/xfce4/panel/plugins
  55          [AC_DEFINE(PANEL_XFCE4, 1, [panel type])]
  56          ,
  57      [AC_MSG_ERROR([Unknown panel type, use gnome2, gnome3, gnomeflashback, mate or xfce4])]