[gnome-panel/gtk3] libpanel-applet: Add libpanel_applet_dir variable in libbpanelapplet.pc



commit c45e8043dc107a7dff1c7eb46074f6d85724ad13
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Jan 31 10:20:19 2011 +0100

    libpanel-applet: Add libpanel_applet_dir variable in libbpanelapplet.pc
    
    This makes it easier for applet developers to know where to install the
    .panel-applet files.

 configure.ac                         |    9 +++++----
 libpanel-applet/libpanelapplet.pc.in |    3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 30c36e9..ac93912 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,8 @@ GNOME_COMMON_INIT
 #   change to C+1:0:0
 # - If the interface is the same as the previous version, change to C:R+1:A
 
-m4_define([libpanel_applet_api_version],[4.0])
-AC_SUBST([LIBPANEL_APPLET_API_VERSION],[libpanel_applet_api_version])
+LIBPANEL_APPLET_API_VERSION=4.0
+AC_SUBST([LIBPANEL_APPLET_API_VERSION],[$LIBPANEL_APPLET_API_VERSION])
 
 LIB_PANEL_APPLET_LT_VERSION=0:5:0
 AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
@@ -253,6 +253,7 @@ AC_SUBST([modulesdir],"\$(libdir)/gnome-panel/modules")
 
 dnl Applets dir
 AC_SUBST([appletsdir],"\$(datadir)/gnome-panel/\$(LIBPANEL_APPLET_API_VERSION)/applets")
+AC_SUBST([appletsdir_pkgconfig],"\${datadir}/gnome-panel/\${libpanel_applet_api_version}/applets")
 
 dnl
 dnl Temporary bonobo checks here
@@ -388,8 +389,8 @@ bonobo/libpanel-applet/Makefile
 bonobo/panel-module/Makefile
 ])
 
-AC_CONFIG_FILES(libpanel-applet/libpanelapplet-[]libpanel_applet_api_version[].pc:libpanel-applet/libpanelapplet.pc.in)
-AC_CONFIG_FILES(libpanel-applet/libpanelapplet-[]libpanel_applet_api_version[]-uninstalled.pc:libpanel-applet/libpanelapplet-uninstalled.pc.in)
+AC_CONFIG_FILES(libpanel-applet/libpanelapplet-$LIBPANEL_APPLET_API_VERSION.pc:libpanel-applet/libpanelapplet.pc.in)
+AC_CONFIG_FILES(libpanel-applet/libpanelapplet-$LIBPANEL_APPLET_API_VERSION-uninstalled.pc:libpanel-applet/libpanelapplet-uninstalled.pc.in)
 
 AC_OUTPUT
 
diff --git a/libpanel-applet/libpanelapplet.pc.in b/libpanel-applet/libpanelapplet.pc.in
index 6b696d2..c1c303e 100644
--- a/libpanel-applet/libpanelapplet.pc.in
+++ b/libpanel-applet/libpanelapplet.pc.in
@@ -2,8 +2,11 @@ prefix= prefix@
 exec_prefix= exec_prefix@
 libdir= libdir@
 includedir= includedir@
+datarootdir= datarootdir@
+datadir= datadir@
 
 libpanel_applet_api_version= LIBPANEL_APPLET_API_VERSION@
+libpanel_applet_dir= appletsdir_pkgconfig@
 
 Name: libpanel-applet-4
 Description: libpanel-applet-4



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]