ayatana-commits team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Ted Gould (ted)
Related merge proposals:
  https://code.launchpad.net/~ted/indicator-messages/icons-fix/+merge/12396
  proposed by: Ted Gould (ted)
  review: Approve - Cody Russell (bratsche)
------------------------------------------------------------
revno: 146 [merge]
committer: Ted Gould <ted@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-09-25 08:37:52 -0500
message:
  Getting the path for icons from pkgconfig and putting them in the right location.
modified:
  configure.ac
  data/icons/16x16/status/Makefile.am
  data/icons/22x22/status/Makefile.am
  data/icons/24x24/status/Makefile.am
  data/icons/32x32/status/Makefile.am
  data/icons/48x48/status/Makefile.am
  data/icons/scalable/status/Makefile.am


--
lp:indicator-messages
https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk

Your team ayatana-commits is subscribed to branch lp:indicator-messages.
To unsubscribe from this branch go to https://code.launchpad.net/~indicator-applet-developers/indicator-messages/trunk/+edit-subscription.

=== modified file 'configure.ac'
--- configure.ac	2009-09-24 18:04:30 +0000
+++ configure.ac	2009-09-25 01:25:44 +0000
@@ -53,10 +53,13 @@
 
 if test "x$with_localinstall" = "xyes"; then
 	INDICATORDIR="${libdir}/indicators/2/"
+	INDICATORICONSDIR="${datadir}/libindicate/icons/"
 else
 	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
+	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
 fi
 AC_SUBST(INDICATORDIR)
+AC_SUBST(INDICATORICONSDIR)
 
 ###########################
 # DBus Service Info

=== modified file 'data/icons/16x16/status/Makefile.am'
--- data/icons/16x16/status/Makefile.am	2009-02-04 17:12:37 +0000
+++ data/icons/16x16/status/Makefile.am	2009-09-25 01:28:38 +0000
@@ -1,5 +1,5 @@
 
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/16x16/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/status
 
 icons_DATA =  \
 	indicator-messages.png \

=== modified file 'data/icons/22x22/status/Makefile.am'
--- data/icons/22x22/status/Makefile.am	2009-02-04 17:12:37 +0000
+++ data/icons/22x22/status/Makefile.am	2009-09-25 01:28:38 +0000
@@ -1,5 +1,5 @@
 
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/22x22/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/status
 
 icons_DATA =  \
 	indicator-messages.png \

=== modified file 'data/icons/24x24/status/Makefile.am'
--- data/icons/24x24/status/Makefile.am	2009-02-04 17:12:37 +0000
+++ data/icons/24x24/status/Makefile.am	2009-09-25 01:28:38 +0000
@@ -1,5 +1,5 @@
 
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/24x24/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/status
 
 icons_DATA =  \
 	indicator-messages.png \

=== modified file 'data/icons/32x32/status/Makefile.am'
--- data/icons/32x32/status/Makefile.am	2009-02-04 17:12:37 +0000
+++ data/icons/32x32/status/Makefile.am	2009-09-25 01:28:38 +0000
@@ -1,5 +1,5 @@
 
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/32x32/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/status
 
 icons_DATA =  \
 	indicator-messages.png \

=== modified file 'data/icons/48x48/status/Makefile.am'
--- data/icons/48x48/status/Makefile.am	2009-02-04 17:12:37 +0000
+++ data/icons/48x48/status/Makefile.am	2009-09-25 01:28:38 +0000
@@ -1,5 +1,5 @@
 
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/48x48/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/48x48/status
 
 icons_DATA =  \
 	indicator-messages.png \

=== modified file 'data/icons/scalable/status/Makefile.am'
--- data/icons/scalable/status/Makefile.am	2009-02-04 17:12:37 +0000
+++ data/icons/scalable/status/Makefile.am	2009-09-25 01:28:38 +0000
@@ -1,5 +1,5 @@
 
-iconsdir = $(datadir)/indicator-applet/icons/hicolor/scalable/status
+iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/status
 
 icons_DATA =  \
 	indicator-messages.svg \