GNOME.org
 

[gnome-applets/wip/gnome-3.10+] install applets into libpanel_applet_dir

commit 8baaae8bf4b064bee82c5a6bb958d56dfa0f48a2
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                   |    9 +++++++--
 cpufreq/Makefile.am            |    2 +-
 drivemount/Makefile.am         |    2 +-
 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        |    2 +-
 multiload/Makefile.am          |    2 +-
 stickynotes/Makefile.am        |    2 +-
 trashapplet/Makefile.am        |    2 +-
 16 files changed, 22 insertions(+), 16 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d276dca..9f000db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,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 5a0fa61..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/$(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 ff77ab3..9cf2cf5 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -75,7 +75,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-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 3df82af..991642a 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.ac b/configure.ac
index fd3db85..8e81015 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,8 +122,13 @@ PKG_CHECK_MODULES(GNOME_APPLETS, libpanel-applet >= $LIBPANEL_REQUIRED)
 AC_SUBST(GNOME_APPLETS_CFLAGS)
 AC_SUBST(GNOME_APPLETS_LIBS)
 
-LIBPANEL_APPLET_API_VERSION=`$PKG_CONFIG --variable=libpanel_applet_api_version libpanel-applet`
-AC_SUBST(LIBPANEL_APPLET_API_VERSION)
+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
diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am
index 028193b..805fd4c 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -16,7 +16,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-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 fac7710..b83edd6 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 21dedf9..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/$(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 1f6b4e3..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/$(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/invest-applet/data/Makefile.am b/invest-applet/data/Makefile.am
index 87a26e0..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/$(LIBPANEL_APPLET_API_VERSION)/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 90c3750..b81d01e 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -55,7 +55,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 95abf6a..252806a 100644
--- a/mixer/Makefile.am
+++ b/mixer/Makefile.am
@@ -23,7 +23,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 9109902..42c264a 100644
--- a/modemlights/Makefile.am
+++ b/modemlights/Makefile.am
@@ -18,7 +18,7 @@ modem_applet_LDADD =          \
 uidir  = $(pkgdatadir)/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 7bfa645..8dd4c7c 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -49,7 +49,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/stickynotes/Makefile.am b/stickynotes/Makefile.am
index c8a04a5..e935301 100644
--- a/stickynotes/Makefile.am
+++ b/stickynotes/Makefile.am
@@ -55,7 +55,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-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 27b22a7..4cb07f3 100644
--- a/trashapplet/Makefile.am
+++ b/trashapplet/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = help src
 
-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]