GNOME.org
 

[gnome-applets] build: remove LIBPANEL_APPLET_API_VERSION

commit dd46ff4a410927bbdee1ffc42a68b3a455fa2d37
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Wed Sep 21 15:02:02 2016 +0300

    build: remove LIBPANEL_APPLET_API_VERSION

 accessx-status/Makefile.am          |    2 +-
 accessx-status/src/Makefile.am      |    2 +-
 battstat/Makefile.am                |    2 +-
 battstat/src/Makefile.am            |    2 +-
 brightness/Makefile.am              |    2 +-
 brightness/src/Makefile.am          |    2 +-
 charpick/Makefile.am                |    2 +-
 charpick/src/Makefile.am            |    2 +-
 command/Makefile.am                 |    2 +-
 command/src/Makefile.am             |    2 +-
 configure.ac                        |    3 ---
 cpufreq/Makefile.am                 |    2 +-
 cpufreq/src/Makefile.am             |    2 +-
 drivemount/Makefile.am              |    2 +-
 drivemount/src/Makefile.am          |    2 +-
 geyes/Makefile.am                   |    2 +-
 geyes/src/Makefile.am               |    2 +-
 gweather/Makefile.am                |    2 +-
 gweather/src/Makefile.am            |    2 +-
 inhibit/Makefile.am                 |    2 +-
 inhibit/src/Makefile.am             |    2 +-
 invest-applet/data/Makefile.am      |    2 +-
 invest-applet/invest/Makefile.am    |    2 +-
 mini-commander/src/Makefile.am      |    4 ++--
 modem-lights/Makefile.am            |    2 +-
 modem-lights/src/Makefile.am        |    2 +-
 multiload/Makefile.am               |    2 +-
 multiload/src/Makefile.am           |    2 +-
 netspeed/data/Makefile.am           |    2 +-
 netspeed/src/Makefile.am            |    2 +-
 sticky-notes/data/Makefile.am       |    2 +-
 sticky-notes/src/Makefile.am        |    2 +-
 timer/data/Makefile.am              |    2 +-
 timer/src/Makefile.am               |    2 +-
 tracker-search-bar/data/Makefile.am |    2 +-
 tracker-search-bar/src/Makefile.am  |    2 +-
 trash/data/Makefile.am              |    2 +-
 trash/src/Makefile.am               |    2 +-
 windowpicker/data/Makefile.am       |    2 +-
 windowpicker/src/Makefile.am        |    2 +-
 40 files changed, 40 insertions(+), 43 deletions(-)
---
diff --git a/accessx-status/Makefile.am b/accessx-status/Makefile.am
index 780026b..ed56fa8 100644
--- a/accessx-status/Makefile.am
+++ b/accessx-status/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = help pixmaps src
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libaccessx-status-applet.so
+APPLET_LOCATION = $(pkglibdir)/libaccessx-status-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.AccessxStatusApplet.panel-applet.in
diff --git a/accessx-status/src/Makefile.am b/accessx-status/src/Makefile.am
index 041dd06..f191644 100644
--- a/accessx-status/src/Makefile.am
+++ b/accessx-status/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir   = $(pkgdatadir)/ui
 
-accessx_status_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+accessx_status_applet_libdir = $(pkglibdir)
 accessx_status_applet_lib_LTLIBRARIES = libaccessx-status-applet.la
 
 libaccessx_status_applet_la_CPPFLAGS = \
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 290ddb4..f360ae5 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -20,7 +20,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libbattery-status-applet.so
+APPLET_LOCATION = $(pkglibdir)/libbattery-status-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.BattstatApplet.panel-applet.in
diff --git a/battstat/src/Makefile.am b/battstat/src/Makefile.am
index 7f35c73..c889a51 100644
--- a/battstat/src/Makefile.am
+++ b/battstat/src/Makefile.am
@@ -20,7 +20,7 @@ APMDIR =
 APMINC =
 endif
 
-battery_status_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+battery_status_applet_libdir = $(pkglibdir)
 battery_status_applet_lib_LTLIBRARIES = libbattery-status-applet.la
 
 libbattery_status_applet_la_CPPFLAGS = \
diff --git a/brightness/Makefile.am b/brightness/Makefile.am
index 7c1fbba..34ad9d6 100644
--- a/brightness/Makefile.am
+++ b/brightness/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = icons src
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libbrightness-applet.so
+APPLET_LOCATION = $(pkglibdir)/libbrightness-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.BrightnessApplet.panel-applet.in
diff --git a/brightness/src/Makefile.am b/brightness/src/Makefile.am
index 05486d5..b1790e2 100644
--- a/brightness/src/Makefile.am
+++ b/brightness/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir   = $(pkgdatadir)/ui
 
-brightness_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+brightness_applet_libdir = $(pkglibdir)
 brightness_applet_lib_LTLIBRARIES = libbrightness-applet.la
 
 libbrightness_applet_la_CPPFLAGS = \
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index a88ebb0..9161433 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = help src
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libcharacter-picker-applet.so
+APPLET_LOCATION = $(pkglibdir)/libcharacter-picker-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.CharpickerApplet.panel-applet.in
diff --git a/charpick/src/Makefile.am b/charpick/src/Makefile.am
index 9da901a..25de5bd 100644
--- a/charpick/src/Makefile.am
+++ b/charpick/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir = $(pkgdatadir)/ui
 
-charpick_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+charpick_applet_libdir = $(pkglibdir)
 charpick_applet_lib_LTLIBRARIES = libcharacter-picker-applet.la
 
 libcharacter_picker_applet_la_CPPFLAGS = \
diff --git a/command/Makefile.am b/command/Makefile.am
index 3af6467..59cbd76 100644
--- a/command/Makefile.am
+++ b/command/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = src
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libcommand-applet.so
+APPLET_LOCATION = $(pkglibdir)/libcommand-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.CommandApplet.panel-applet.in
diff --git a/command/src/Makefile.am b/command/src/Makefile.am
index 17620f3..72b8a25 100644
--- a/command/src/Makefile.am
+++ b/command/src/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-command_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+command_applet_libdir = $(pkglibdir)
 command_applet_lib_LTLIBRARIES = libcommand-applet.la
 
 libcommand_applet_la_CPPFLAGS = \
diff --git a/configure.ac b/configure.ac
index c04453a..8d46fc9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,9 +129,6 @@ fi
 AC_MSG_NOTICE([installing applets in $LIBPANEL_APPLET_DIR])
 AC_SUBST(LIBPANEL_APPLET_DIR)
 
-LIBPANEL_APPLET_API_VERSION=`$PKG_CONFIG --variable=libpanel_applet_api_version libpanel-applet`
-AC_SUBST(LIBPANEL_APPLET_API_VERSION)
-
 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 f557684..a188ea5 100644
--- a/cpufreq/Makefile.am
+++ b/cpufreq/Makefile.am
@@ -16,7 +16,7 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 @GSETTINGS_RULES@
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libcpu-frequency-applet.so
+APPLET_LOCATION = $(pkglibdir)/libcpu-frequency-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.CPUFreqApplet.panel-applet.in
diff --git a/cpufreq/src/Makefile.am b/cpufreq/src/Makefile.am
index 8d143a5..4423416 100644
--- a/cpufreq/src/Makefile.am
+++ b/cpufreq/src/Makefile.am
@@ -6,7 +6,7 @@ endif
 
 SUBDIRS = $(selector_SUBDIR)
 
-cpu_frequency_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+cpu_frequency_applet_libdir = $(pkglibdir)
 cpu_frequency_applet_lib_LTLIBRARIES = libcpu-frequency-applet.la
 
 libcpu_frequency_applet_la_CPPFLAGS = \
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index 23ff099..dc2cce9 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = help src
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libdrive-mount-applet.so
+APPLET_LOCATION = $(pkglibdir)/libdrive-mount-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.DriveMountApplet.panel-applet.in
diff --git a/drivemount/src/Makefile.am b/drivemount/src/Makefile.am
index 190fe84..af089ed 100644
--- a/drivemount/src/Makefile.am
+++ b/drivemount/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir = $(pkgdatadir)/ui
 
-drivemount_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+drivemount_applet_libdir = $(pkglibdir)
 drivemount_applet_lib_LTLIBRARIES = libdrive-mount-applet.la
 
 libdrive_mount_applet_la_CPPFLAGS = \
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index a3c3b58..2813ace 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = help themes src
 
-APPLET_LOCATION = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libgeyes-applet.so
+APPLET_LOCATION = $(pkglibdir)/libgeyes-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
diff --git a/geyes/src/Makefile.am b/geyes/src/Makefile.am
index f13476b..f2afb4f 100644
--- a/geyes/src/Makefile.am
+++ b/geyes/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir = $(pkgdatadir)/ui
 
-geyes_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+geyes_appletlibdir = $(pkglibdir)
 geyes_appletlib_LTLIBRARIES = libgeyes-applet.la
 
 libgeyes_applet_la_CPPFLAGS = \
diff --git a/gweather/Makefile.am b/gweather/Makefile.am
index 9df6591..d74203b 100644
--- a/gweather/Makefile.am
+++ b/gweather/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = help src
 uidir = $(pkgdatadir)/ui
 ui_DATA = gweather-applet-menu.xml
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libgweather-applet.so
+APPLET_LOCATION=$(pkglibdir)/libgweather-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.GWeatherApplet.panel-applet.in
diff --git a/gweather/src/Makefile.am b/gweather/src/Makefile.am
index bd0e1d8..f97a24d 100644
--- a/gweather/src/Makefile.am
+++ b/gweather/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir = $(pkgdatadir)/ui
 
-gweather_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+gweather_appletlibdir = $(pkglibdir)
 gweather_appletlib_LTLIBRARIES = libgweather-applet.la
 
 libgweather_applet_la_CPPFLAGS = \
diff --git a/inhibit/Makefile.am b/inhibit/Makefile.am
index 7c0bf00..4f75beb 100644
--- a/inhibit/Makefile.am
+++ b/inhibit/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = icons src
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libinhibit-applet.so
+APPLET_LOCATION=$(pkglibdir)/libinhibit-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.InhibitApplet.panel-applet.in
diff --git a/inhibit/src/Makefile.am b/inhibit/src/Makefile.am
index 0226284..0be890a 100644
--- a/inhibit/src/Makefile.am
+++ b/inhibit/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir = $(pkgdatadir)/ui
 
-inhibit_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+inhibit_appletlibdir = $(pkglibdir)
 inhibit_appletlib_LTLIBRARIES = libinhibit-applet.la
 
 libinhibit_applet_la_CPPFLAGS = \
diff --git a/invest-applet/data/Makefile.am b/invest-applet/data/Makefile.am
index 24b82e8..0b98b5f 100644
--- a/invest-applet/data/Makefile.am
+++ b/invest-applet/data/Makefile.am
@@ -8,7 +8,7 @@ appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.InvestApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
-LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libinvest-applet.so
+LOCATION=$(pkglibdir)/libinvest-applet.so
 
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
diff --git a/invest-applet/invest/Makefile.am b/invest-applet/invest/Makefile.am
index 774d8e7..7b6bdb1 100644
--- a/invest-applet/invest/Makefile.am
+++ b/invest-applet/invest/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-invest_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+invest_applet_libdir = $(pkglibdir)
 invest_applet_lib_LTLIBRARIES = libinvest-applet.la
 
 libinvest_applet_la_SOURCES = \
diff --git a/mini-commander/src/Makefile.am b/mini-commander/src/Makefile.am
index 46a53d8..93aea55 100644
--- a/mini-commander/src/Makefile.am
+++ b/mini-commander/src/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-mini_commander_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+mini_commander_applet_libdir = $(pkglibdir)
 mini_commander_applet_lib_LTLIBRARIES = libmini-commander-applet.la
 
 libmini_commander_applet_la_CPPFLAGS = \
@@ -74,7 +74,7 @@ update-icon-cache:
                echo "***   $(gtk_update_icon_cache)"; \
        fi
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libmini-commander-applet.so
+APPLET_LOCATION=$(pkglibdir)/libmini-commander-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.MiniCommanderApplet.panel-applet.in
diff --git a/modem-lights/Makefile.am b/modem-lights/Makefile.am
index 7570569..4579951 100644
--- a/modem-lights/Makefile.am
+++ b/modem-lights/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = src
 uidir  = $(pkgdatadir)/ui
 ui_DATA        = modem-applet-menu.xml
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libmodem-lights-applet.so
+APPLET_LOCATION=$(pkglibdir)/libmodem-lights-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.ModemApplet.panel-applet.in
diff --git a/modem-lights/src/Makefile.am b/modem-lights/src/Makefile.am
index e5d5e2e..efd3825 100644
--- a/modem-lights/src/Makefile.am
+++ b/modem-lights/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir  = $(pkgdatadir)/ui
 
-modem_lights_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+modem_lights_appletlibdir = $(pkglibdir)
 modem_lights_appletlib_LTLIBRARIES = libmodem-lights-applet.la
 
 libmodem_lights_applet_la_CPPFLAGS = \
diff --git a/multiload/Makefile.am b/multiload/Makefile.am
index 6bbf14a..0c0be38 100644
--- a/multiload/Makefile.am
+++ b/multiload/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 SUBDIRS = help src
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libmultiload-applet.so
+APPLET_LOCATION=$(pkglibdir)/libmultiload-applet.so
 
 gsettings_schemas_in_in = \
        org.gnome.gnome-applets.multiload.gschema.xml.in.in
diff --git a/multiload/src/Makefile.am b/multiload/src/Makefile.am
index bdbdae4..d1f3e6a 100644
--- a/multiload/src/Makefile.am
+++ b/multiload/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir = $(pkgdatadir)/ui
 
-multiload_appletlibdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+multiload_appletlibdir = $(pkglibdir)
 multiload_appletlib_LTLIBRARIES = libmultiload-applet.la
 
 libmultiload_applet_la_CPPFLAGS = \
diff --git a/netspeed/data/Makefile.am b/netspeed/data/Makefile.am
index 9453414..ae9f2ef 100644
--- a/netspeed/data/Makefile.am
+++ b/netspeed/data/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libnet-speed-applet.so
+APPLET_LOCATION=$(pkglibdir)/libnet-speed-applet.so
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.panel.Netspeed.panel-applet.in
diff --git a/netspeed/src/Makefile.am b/netspeed/src/Makefile.am
index 9be8cc8..0b23fa5 100644
--- a/netspeed/src/Makefile.am
+++ b/netspeed/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir = $(pkgdatadir)/ui
 
-netspeed_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+netspeed_applet_libdir = $(pkglibdir)
 netspeed_applet_lib_LTLIBRARIES = libnet-speed-applet.la
 
 libnet_speed_applet_la_CPPFLAGS = \
diff --git a/sticky-notes/data/Makefile.am b/sticky-notes/data/Makefile.am
index 6541647..66ff937 100644
--- a/sticky-notes/data/Makefile.am
+++ b/sticky-notes/data/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libsticky-notes-applet.so
+APPLET_LOCATION=$(pkglibdir)/libsticky-notes-applet.so
 
 appletdir   = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.StickyNotesApplet.panel-applet.in
diff --git a/sticky-notes/src/Makefile.am b/sticky-notes/src/Makefile.am
index dc3eacb..238273d 100644
--- a/sticky-notes/src/Makefile.am
+++ b/sticky-notes/src/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 if BUILD_STICKYNOTES_APPLET
 
-stickynotes_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+stickynotes_applet_libdir = $(pkglibdir)
 stickynotes_applet_lib_LTLIBRARIES = libsticky-notes-applet.la
 
 libsticky_notes_applet_la_CPPFLAGS = \
diff --git a/timer/data/Makefile.am b/timer/data/Makefile.am
index 171c015..76f5931 100644
--- a/timer/data/Makefile.am
+++ b/timer/data/Makefile.am
@@ -4,7 +4,7 @@ appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.TimerApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtimer-applet.so
+APPLET_LOCATION=$(pkglibdir)/libtimer-applet.so
 
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
diff --git a/timer/src/Makefile.am b/timer/src/Makefile.am
index a4a9d89..6f4ef59 100644
--- a/timer/src/Makefile.am
+++ b/timer/src/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-timer_applet_libdir = $(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)
+timer_applet_libdir = $(pkglibdir)
 timer_applet_lib_LTLIBRARIES = libtimer-applet.la
 
 libtimer_applet_la_CPPFLAGS = \
diff --git a/tracker-search-bar/data/Makefile.am b/tracker-search-bar/data/Makefile.am
index 21a5b1d..0c09868 100644
--- a/tracker-search-bar/data/Makefile.am
+++ b/tracker-search-bar/data/Makefile.am
@@ -4,7 +4,7 @@ appletdir = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.panel.SearchBar.panel-applet.in
 applet_DATA = $(applet_in_files:.panel-applet.in=.panel-applet)
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtracker-search-bar-applet.so
+APPLET_LOCATION=$(pkglibdir)/libtracker-search-bar-applet.so
 
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed                                 \
diff --git a/tracker-search-bar/src/Makefile.am b/tracker-search-bar/src/Makefile.am
index 81aa1f7..0cd21f1 100644
--- a/tracker-search-bar/src/Makefile.am
+++ b/tracker-search-bar/src/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-tracker_search_bar_libdir=${pkglibdir}/${LIBPANEL_APPLET_API_VERSION}
+tracker_search_bar_libdir=${pkglibdir}
 tracker_search_bar_lib_LTLIBRARIES=libtracker-search-bar-applet.la
 
 libtracker_search_bar_applet_la_CPPFLAGS = \
diff --git a/trash/data/Makefile.am b/trash/data/Makefile.am
index e2b0068..6c7fe21 100644
--- a/trash/data/Makefile.am
+++ b/trash/data/Makefile.am
@@ -4,7 +4,7 @@ appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.TrashApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtrash-applet.so
+APPLET_LOCATION=$(pkglibdir)/libtrash-applet.so
 
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
diff --git a/trash/src/Makefile.am b/trash/src/Makefile.am
index 0c2b167..9a41f58 100644
--- a/trash/src/Makefile.am
+++ b/trash/src/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-trash_libdir=${pkglibdir}/${LIBPANEL_APPLET_API_VERSION}
+trash_libdir=${pkglibdir}
 trash_lib_LTLIBRARIES=libtrash-applet.la
 
 libtrash_applet_la_CPPFLAGS = \
diff --git a/windowpicker/data/Makefile.am b/windowpicker/data/Makefile.am
index fea57fa..4eb7d79 100644
--- a/windowpicker/data/Makefile.am
+++ b/windowpicker/data/Makefile.am
@@ -2,7 +2,7 @@ appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.WindowPicker.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libwindow-picker-applet.so
+APPLET_LOCATION=$(pkglibdir)/libwindow-picker-applet.so
 
 $(applet_in_files): $(applet_in_files).in Makefile
        $(AM_V_GEN)sed \
diff --git a/windowpicker/src/Makefile.am b/windowpicker/src/Makefile.am
index 9597586..352e159 100644
--- a/windowpicker/src/Makefile.am
+++ b/windowpicker/src/Makefile.am
@@ -1,6 +1,6 @@
 NULL =
 
-window_picker_libdir=${pkglibdir}/${LIBPANEL_APPLET_API_VERSION}
+window_picker_libdir=${pkglibdir}
 window_picker_lib_LTLIBRARIES=libwindow-picker-applet.la
 
 libwindow_picker_applet_la_CFLAGS = \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]