# HG changeset patch
# User Eric Warmenhoven <eric@warmenhoven.org>
# Date 953940006 0
# Node ID 1ca691f2a42b149ee7913a9a177e4d7f42457ab9
# Parent  3d5723330ff45ea258fd5e972d5e0962190e027e
[gaim-migrate @ 42]
More applet installation adjustments

committer: Tailor Script <tailor@pidgin.im>

diff -r 3d5723330ff4 -r 1ca691f2a42b Makefile.am
--- a/Makefile.am	Fri Mar 24 23:06:40 2000 +0000
+++ b/Makefile.am	Fri Mar 24 23:20:06 2000 +0000
@@ -1,6 +1,8 @@
 
 EXTRA_DIST = gaim_applet.gnorba gaim_applet.desktop buddytrans
 
+if GNOMEAPPLET
+
 gaim_GNORBA = gaim_applet.gnorba
 gaimgnorbadir  = $(sysconfdir)/CORBA/servers
 gaimgnorba_DATA = $(gaim_GNORBA)
@@ -9,6 +11,7 @@
 gaimdesktopdir = $(datadir)/applets/Network
 gaimdesktop_DATA = $(gaim_DESKTOP)
 
+endif
 
 SUBDIRS = m4 libfaim sounds pixmaps doc src
 ACLOCAL_AMFLAGS = -I m4
diff -r 3d5723330ff4 -r 1ca691f2a42b pixmaps/Makefile.am
--- a/pixmaps/Makefile.am	Fri Mar 24 23:06:40 2000 +0000
+++ b/pixmaps/Makefile.am	Fri Mar 24 23:20:06 2000 +0000
@@ -15,7 +15,7 @@
 	penguin-offline.png penguin-online.png
 	
 if GNOMEAPPLET
-gaimpixmapdir = $(datadir)/pixmaps/gaim
+gaimpixmapdir = /usr/share/pixmaps/gaim
 gaimpixmap_DATA = aimicon.xpm penguin-connect.png \
 	penguin-offline.png penguin-online.png
 endif