[gnome-applets] install applets into libpanel_applet_dir

From: Alberts Muktupāvels <muktupavels src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-applets] install applets into libpanel_applet_dir
Date: Thu, 28 Aug 2014 14:09:07 +0000 (UTC)
commit 29205030e19f2146fd04c04a03f29c99aba8199d
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Fri Aug 22 15:51:28 2014 +0300

    install applets into libpanel_applet_dir

 Makefile.am                    |    1 +
 accessx-status/Makefile.am     |    2 +-
 battstat/Makefile.am           |    2 +-
 charpick/Makefile.am           |    2 +-
 configure.ac                   |   10 ++++++++--
 cpufreq/Makefile.am            |    2 +-
 drivemount/Makefile.am         |    3 +--
 geyes/Makefile.am              |    2 +-
 gweather/Makefile.am           |    2 +-
 invest-applet/data/Makefile.am |    2 +-
 mini-commander/src/Makefile.am |    2 +-
 mixer/Makefile.am              |    2 +-
 modemlights/Makefile.am        |    3 +--
 multiload/Makefile.am          |    2 +-
 null_applet/Makefile.am        |    2 +-
 stickynotes/Makefile.am        |    2 +-
 trashapplet/Makefile.am        |    2 +-
 17 files changed, 24 insertions(+), 19 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d2bdebb..d3faf18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -92,6 +92,7 @@ EXTRA_DIST = \
        intltool-merge.in
 
 DISTCHECK_CONFIGURE_FLAGS =    \
+       --with-libpanel-applet-dir='$${datadir}/gnome-panel/distcheck/applets'
        --enable-mini-commander \
        --enable-mixer-applet
 
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index b98c5cc..d9bc726 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/4.0/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 0e72268..9f99fa1 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -69,7 +69,7 @@ install-data-local:
        GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule 
$(schemas_DATA) ;
 endif
 
-appletdir       = $(datadir)/gnome-panel/4.0/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 d9a6ef4..742a417 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/4.0/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.ac b/configure.ac
index 5999cd5..ae60769 100644
--- a/configure.ac
+++ b/configure.ac
@@ -119,11 +119,17 @@ AC_SUBST(GTK_LIBS)
 
 dnl -- check for libpanelapplet (required) ------------------------------------
 PKG_CHECK_MODULES(GNOME_APPLETS, libpanelapplet-4.0 >= $LIBPANEL_REQUIRED)
-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)
 
+AC_ARG_WITH([libpanel-applet-dir], [], [LIBPANEL_APPLET_DIR=$withval], [LIBPANEL_APPLET_DIR=""])
+if test "$LIBPANEL_APPLET_DIR" == ""; then
+       LIBPANEL_APPLET_DIR=`$PKG_CONFIG --variable=libpanel_applet_dir libpanel-applet`
+fi
+
+AC_MSG_NOTICE([installing applets in $LIBPANEL_APPLET_DIR])
+AC_SUBST(LIBPANEL_APPLET_DIR)
+
 dnl -- check for libgtop (optional) -------------------------------------------
 build_gtop_applets=false
 PKG_CHECK_MODULES(GTOP_APPLETS,
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 75ad26f..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/4.0/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 bc77638..0cf4bc8 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -21,8 +21,7 @@ drivemount_applet2_LDADD =    \
        $(GNOME_APPLETS_LIBS)   \
        $(GIO_UNIX_LIBS)
 
-
-appletdir       = $(datadir)/gnome-panel/4.0/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 faa4b0b..94c26ce 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -19,7 +19,7 @@ geyes_applet2_LDADD =                 \
        $(GNOME_APPLETS_LIBS)   \
        $(LIBM)
 
-appletdir       = $(datadir)/gnome-panel/4.0/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 6614088..6fab2a6 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -37,7 +37,7 @@ gweather_applet_2_LDADD =     \
 uidir = $(pkgdatadir)/ui
 ui_DATA = gweather-applet-menu.xml
 
-appletdir       = $(datadir)/gnome-panel/4.0/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/invest-applet/data/Makefile.am b/invest-applet/data/Makefile.am
index 8247530..d1ac0c0 100644
--- a/invest-applet/data/Makefile.am
+++ b/invest-applet/data/Makefile.am
@@ -12,7 +12,7 @@ org.gnome.panel.applet.InvestAppletFactory.service: $(service_in_files)
             -e "s|\ LIBEXECDIR\@|$(libexecdir)|" \
             $< > $@
 
-appletdir       = $(datadir)/gnome-panel/4.0/applets
+appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.InvestApplet.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 23e1d93..2f5810c 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/4.0/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 bc31b16..873047b 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/4.0/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 f1b8efd..eb46bcb 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -18,8 +18,7 @@ modem_applet_LDADD =          \
 uidir  = $(datadir)/gnome-2.0/ui
 ui_DATA        = modem-applet-menu.xml
 
-
-appletdir       = $(datadir)/gnome-panel/4.0/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 a98f66e..66fe0b5 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -42,7 +42,7 @@ EXTRA_DIST =                                                  \
 uidir          = $(pkgdatadir)/ui
 ui_DATA                = multiload-applet-menu.xml
 
-appletdir       = $(datadir)/gnome-panel/4.0/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 ac42edd..e048aa7 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/4.0/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 4ac31b4..5a60b04 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -49,7 +49,7 @@ schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
-appletdir   = $(datadir)/gnome-panel/4.0/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 d63ae67..4cb07f3 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help src
 
-appletdir       = $(datadir)/gnome-panel/4.0/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]