GNOME.org
 

[gnome-applets] build: Use libpanel_applet_dir from libpanelapplet-4.0.pc

commit b477024f4d0b25219c2f0f7af44c05ac348005ae
Author: Vincent Untz <vuntz gnome org>
Date:   Thu Feb 24 12:32:15 2011 +0100

    build: Use libpanel_applet_dir from libpanelapplet-4.0.pc
    
    This makes it easier to know where to install .panel-applet files.

 accessx-status/Makefile.am     |    2 +-
 battstat/Makefile.am           |    2 +-
 charpick/Makefile.am           |    2 +-
 configure.in                   |    4 ++--
 cpufreq/Makefile.am            |    2 +-
 drivemount/Makefile.am         |    2 +-
 geyes/Makefile.am              |    2 +-
 gweather/Makefile.am           |    2 +-
 mini-commander/src/Makefile.am |    2 +-
 mixer/Makefile.am              |    2 +-
 modemlights/Makefile.am        |    2 +-
 multiload/Makefile.am          |    2 +-
 null_applet/Makefile.am        |    2 +-
 stickynotes/Makefile.am        |    2 +-
 trashapplet/Makefile.am        |    2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 6c07f5b..96d0515 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -20,7 +20,7 @@ accessx_status_applet_LDADD =	\
 	$(GIO_UNIX_LIBS)	\
         $(X_LIBS)
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.AccessxStatusApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index fc57ca4..e607d19 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -68,7 +68,7 @@ install-data-local:
 	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schemas_DATA) ;
 endif
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.BattstatApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index e7ac334..43486ce 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -17,7 +17,7 @@ charpick_applet2_LDADD = \
 		       $(GNOME_APPLETS_LIBS)	\
 		       $(GUCHARMAP_LIBS)
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.CharpickerApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/configure.in b/configure.in
index 18eea61..a9bc6a5 100644
--- a/configure.in
+++ b/configure.in
@@ -120,8 +120,8 @@ AC_SUBST(GTK_LIBS)
 
 dnl -- check for libpanelapplet (required) ------------------------------------
 PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-4.0 >= $LIBPANEL_REQUIRED)
-LIBPANEL_APPLET_API_VERSION=`$PKG_CONFIG --variable=libpanel_applet_api_version libpanelapplet-4.0`
-AC_SUBST(LIBPANEL_APPLET_API_VERSION)
+LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanelapplet-4.0`
+AC_SUBST(LIBPANEL_APPLET_DIR)
 AC_SUBST(GNOME_APPLETS_CFLAGS)
 AC_SUBST(GNOME_APPLETS_LIBS)
 
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 413e0a4..9315a7e 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -6,7 +6,7 @@ schemas_DATA     = $(schemas_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.CPUFreqApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 89b3fc3..6b04fcc 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -22,7 +22,7 @@ drivemount_applet2_LDADD =	\
 	$(GIO_UNIX_LIBS)
 
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.DriveMountApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index d30c0c3..d8fe2ab 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -18,7 +18,7 @@ geyes_applet2_SOURCES =	\
 geyes_applet2_LDADD = 		\
 	$(GNOME_APPLETS_LIBS)
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index f7d93b6..bb77c23 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -36,7 +36,7 @@ gweather_applet_2_LDADD = 	\
 uidir = $(pkgdatadir)/ui
 ui_DATA = gweather-applet-menu.xml
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.GWeatherApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index da7f878..17f008d 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -65,7 +65,7 @@ update-icon-cache:
 		echo "***   $(gtk_update_icon_cache)"; \
 	fi
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.MiniCommanderApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/mixer/Makefile.am b/mixer/Makefile.am
index f91f9d0..27ea8bf 100644
--- a/mixer/Makefile.am
+++ b/mixer/Makefile.am
@@ -24,7 +24,7 @@ mixer_applet2_LDADD = 					\
 	$(MIXER_LIBS) 					\
 	$(GNOME_APPLETS_LIBS)
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.MixerApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/modemlights/Makefile.am b/modemlights/Makefile.am
index b5861f8..f3ccd34 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -19,7 +19,7 @@ uidir	= $(datadir)/gnome-2.0/ui
 ui_DATA	= modem-applet-menu.xml
 
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.ModemApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 9e3c324..b4f7f7d 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -41,7 +41,7 @@ EXTRA_DIST =							\
 uidir		= $(pkgdatadir)/ui
 ui_DATA		= multiload-applet-menu.xml
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.MultiLoadApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/null_applet/Makefile.am b/null_applet/Makefile.am
index 3b97bd0..64ced1c 100644
--- a/null_applet/Makefile.am
+++ b/null_applet/Makefile.am
@@ -13,7 +13,7 @@ null_applet_SOURCES = null_applet.c null_applet.h
 
 null_applet_LDADD = $(GNOME_APPLETS_LIBS)
 
-appletdir = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir = $(LIBPANEL_APPLET_DIR)
 applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am
index 250ad9a..4fb2b48 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -48,7 +48,7 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
-appletdir   = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir   = $(LIBPANEL_APPLET_DIR)
 applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
diff --git a/trashapplet/Makefile.am b/trashapplet/Makefile.am
index debfbbb..9f0ffa8 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = src docs
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.TrashApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]