[gnome-panel/gtk3] build: Do not redefine where .panel-applet files get installed



commit ba232b6260caa64d5e0962973ad09312dbf2e6f2
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Jan 31 11:42:21 2011 +0100

    build: Do not redefine where .panel-applet files get installed
    
    We have a variable from the configure script for this.

 applets/clock/Makefile.am             |    2 +-
 applets/fish/Makefile.am              |    2 +-
 applets/notification_area/Makefile.am |    2 +-
 applets/wncklet/Makefile.am           |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am
index 645dce0..4d042cf 100644
--- a/applets/clock/Makefile.am
+++ b/applets/clock/Makefile.am
@@ -136,7 +136,7 @@ BUILT_SOURCES =					\
 	clock-typebuiltins.c			\
 	clock-typebuiltins.h
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.ClockApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 4207e2e..bdcb6db 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -39,7 +39,7 @@ fish_applet_LDADD = $(FISH_LDADD)
 fish_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.FishApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am
index ca70fb1..cd871c1 100644
--- a/applets/notification_area/Makefile.am
+++ b/applets/notification_area/Makefile.am
@@ -70,7 +70,7 @@ na-marshal.c: na-marshal.list $(GLIB_GENMARSHAL)
 
 BUILT_SOURCES = na-marshal.c na-marshal.h
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.NotificationAreaApplet.panel-applet.in
 applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 
diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am
index 2bacc15..b3f0c1d 100644
--- a/applets/wncklet/Makefile.am
+++ b/applets/wncklet/Makefile.am
@@ -51,7 +51,7 @@ wnck_applet_LDADD = $(WNCKLET_LDADD)
 wnck_applet_CFLAGS = $(AM_CFLAGS)
 endif
 
-appletdir       = $(datadir)/gnome-panel/$(LIBPANEL_APPLET_API_VERSION)/applets
+appletdir       = $(appletsdir)
 applet_in_files = org.gnome.panel.Wncklet.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]